Skip to content

Conversation

sayboras
Copy link
Member

@sayboras sayboras commented May 28, 2023

Once this PR is merged, you can update the PR labels via:

$ for pr in 25422 25570 25665 25674; do contrib/backporting/set-labels.py $pr done 1.12; done

@sayboras sayboras requested review from a team as code owners May 28, 2023 01:42
@sayboras sayboras requested a review from nathanjsweet May 28, 2023 01:42
@sayboras sayboras added kind/backports This PR provides functionality previously merged into master. backport/1.12 labels May 28, 2023
@sayboras sayboras marked this pull request as draft May 28, 2023 01:49
@sayboras sayboras force-pushed the pr/v1.12-backport-2023-05-28 branch from 7d5cb09 to b837996 Compare May 28, 2023 05:04
@sayboras
Copy link
Member Author

/test-backport-1.12

@sayboras sayboras force-pushed the pr/v1.12-backport-2023-05-28 branch from b837996 to ae1f8c0 Compare May 29, 2023 11:36
@sayboras
Copy link
Member Author

sayboras commented May 29, 2023

/test-backport-1.12

Job 'Cilium-PR-K8s-1.18-kernel-4.9' failed:

Click to show.

Test Name

K8sPolicyTest Multi-node policy test with L7 policy using connectivity-check to check datapath

Failure Output

FAIL: cannot install connectivity-check

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.18-kernel-4.9/21/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.18-kernel-4.9 so I can create one.

Then please upload the Jenkins artifacts to that issue.

@sayboras sayboras marked this pull request as ready for review May 29, 2023 11:37
Copy link
Member

@mhofstetter mhofstetter left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sayboras thanks for the backport. requested some small changes regarding my backport.

@sayboras sayboras force-pushed the pr/v1.12-backport-2023-05-28 branch from ae1f8c0 to 6a30568 Compare May 30, 2023 14:03
@sayboras sayboras requested a review from mhofstetter May 30, 2023 14:04
@sayboras
Copy link
Member Author

/test-backport-1.12

Copy link
Member

@nathanjsweet nathanjsweet left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry, I spoke to soon.

@aanm aanm added the dont-merge/blocked Another PR must be merged before this one. label May 31, 2023
@aanm
Copy link
Member

aanm commented Jun 1, 2023

@sayboras can we drop #20410 from this PR. I've discussed with @nathanjsweet offline.

@sayboras
Copy link
Member Author

sayboras commented Jun 1, 2023

Sure, let me do it shortly 👍

jrajahalme and others added 4 commits June 2, 2023 01:28
[ upstream commit bfa4656 ]

Remove logic from Documentation/Makefile that skips building
'update-helm-values' on non-x86 platforms. This limitation is no longer
needed as we use the helm toolbox image, which is available for multiple
architectures.

Fixes: cilium#20236
Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit be2306d ]

This is to correct the typo (i.e. l7Proxy instead of l7proxy)
in helm validation if Ingress or Gateway API is enabled. Negative
testing is done as per below

```
$ helm template --namespace kube-system cilium "./install/kubernetes/cilium" --set ingressController.enabled=true --set l7Proxy=false
Error: execution error at (cilium/templates/validate.yaml:52:9): Ingress or Gateway API controller requires .Values.l7Proxy to be set to 'true'

$ helm template --namespace kube-system cilium "./install/kubernetes/cilium" --set gatewayAPI.enabled=true --set l7Proxy=false
Error: execution error at (cilium/templates/validate.yaml:52:9): Ingress or Gateway API controller requires .Values.l7Proxy to be set to 'true'

```

Fixes: ea404cf

Reported-by: Yutaro Hayakawa <yutaro.hayakawa@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit a0bfd5d ]

The entity `ingress` is missing from the list of pre-defined entities
which are available when defining policies which `fromEntities` and
`toEntities`.

This commits fixes this.

Signed-off-by: Marco Hofstetter <marco.hofstetter@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
[ upstream commit e8fcd6b ]

Envoy by default gets the source address from the `x-forwarded-for`
header, if present. Always add an explicit `use_remote_address: true` for
Envoy HTTP Connection Manager configuration to disable the default
behavior.

Also set the `skip_xff_append: true` option to retain the old behavior of
not adding `x-forwarded-for` headers on cilium envoy proxy.

Setting these options is not really needed for admin and metrics
listeners, or most of the tests, but we add them there too in case anyone
uses them as a source of inspiration for a real proxy configuration.

This fixes incorrect hubble flow data when HTTP requests contain an
`x-forwarded-for` header. This change has no effect on Cilium policy
enforcement where the source security identity is always resolved before
HTTP headers are parsed.

Fixes: cilium#25630
Signed-off-by: Jarno Rajahalme <jarno@isovalent.com>
Signed-off-by: Tam Mach <tam.mach@cilium.io>
@sayboras sayboras force-pushed the pr/v1.12-backport-2023-05-28 branch from 6a30568 to bfb862c Compare June 1, 2023 15:28
@sayboras
Copy link
Member Author

sayboras commented Jun 1, 2023

/test

@sayboras sayboras requested a review from nathanjsweet June 1, 2023 15:30
@aanm aanm removed the dont-merge/blocked Another PR must be merged before this one. label Jun 1, 2023
@sayboras sayboras requested review from nathanjsweet and removed request for nathanjsweet and alan-kut June 2, 2023 09:33
@sayboras
Copy link
Member Author

sayboras commented Jun 2, 2023

/test-backport-1.12

Job 'Cilium-PR-K8s-1.19-kernel-4.9' failed:

Click to show.

Test Name

K8sPolicyTest Basic Test checks all kind of Kubernetes policies

Failure Output

FAIL: Failed to retrieve DNS replicas via 'kubectl get deploy -n kube-system -l k8s-app=kube-dns -o jsonpath='{.items[*].status.replicas}'': strconv.Atoi: parsing "": invalid syntax

Jenkins URL: https://jenkins.cilium.io/job/Cilium-PR-K8s-1.19-kernel-4.9/20/

If it is a flake and a GitHub issue doesn't already exist to track it, comment /mlh new-flake Cilium-PR-K8s-1.19-kernel-4.9 so I can create one.

Then please upload the Jenkins artifacts to that issue.

@sayboras
Copy link
Member Author

sayboras commented Jun 2, 2023

/test-1.19-4.9

@sayboras
Copy link
Member Author

sayboras commented Jun 3, 2023

Change requested is for the PR, which is dropped after, most of the reviews are in. Some failures in CI is due to wrong command trigger (e.g. /test instead of /test-backport-1.12), all required CI jobs are passed, marking this ready to merge.

@sayboras sayboras added the ready-to-merge This PR has passed all tests and received consensus from code owners to merge. label Jun 3, 2023
@dylandreimerink dylandreimerink merged commit a824344 into cilium:v1.12 Jun 5, 2023
@sayboras sayboras deleted the pr/v1.12-backport-2023-05-28 branch June 5, 2023 12:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/backports This PR provides functionality previously merged into master. ready-to-merge This PR has passed all tests and received consensus from code owners to merge.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants