v1.13 Backports 2023-08-28 #27741
Merged
v1.13 Backports 2023-08-28 #27741
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pippolo84
added
kind/backports
brlbil
force-pushed
the
pr/v1.13-backport-2023-08-28
branch
2 times, most recently
from
3c54df1
to
2591489
Compare
brlbil
approved these changes
Aug 29, 2023
There was a problem hiding this comment.
I have made small changes to my commit.
Since some of the workflow names changed, Required Workflows need to be adjusted after this is merged.
The list of changes is below.
-name: ConformanceAKS (ci-aks)
+name: Conformance AKS (ci-aks)
--
-name: ClusterMesh (ci-multicluster)
+name: Conformance Cluster Mesh (ci-clustermesh)
--
-name: Cilium Conformance E2E (ci-e2e)
+name: Conformance E2E (ci-e2e)
--
-name: ConformanceEKS (ci-eks)
+name: Conformance EKS (ci-eks)
--
-name: External workloads (ci-external-workloads)
+name: Conformance External Workloads (ci-external-workloads)
--
-name: ConformanceGatewayAPI
+name: Conformance Gateway API
--
-name: ConformanceGKE (ci-gke)
+name: Conformance GKE (ci-gke)
--
-name: ConformanceIngress
+name: Conformance Ingress
--
-name: ConformanceKind
+name: Conformance Kind
--
-name: BPF checks
+name: BPF Checks
--
-name: build-commits
+name: Build Commits
--
-name: codeql
+name: CodeQL
--
-name: Go-related checks
+name: Go Related Checks
--
-name: Smoke test
+name: Smoke Test
Also, Branch protection rules need to be adjusted.
To Remove
build datapath
coccicheck
conformance-test
conformance-test-ipv6
generate-api
generate-k8s-api
go-mod
helm-charts
installation-and-connectivity
To Add
BPF Checks / Build Datapath
BPF Checks / Run coccicheck
Smoke Test / Installation and Conformance Test
Smoke Test with IPv6 / Installation and Conformance Test
Go Related Checks / Generate API
Go Related Checks / Generate k8s API
Go Related Checks / Check Go Modules
Smoke Test / Helm Charts Check
Conformance Kind / Installation and Connectivity Test
[ upstream commit fe37586 ] This is to avoid the below error if proxy is disabled as part of installation, but the visibility annotation is added to pods later. ``` 2023-08-11T12:42:41.390575371Z goroutine 1522 [running]: 2023-08-11T12:42:41.390581994Z github.com/cilium/cilium/pkg/proxy.(*Proxy).CreateOrUpdateRedirect(0x0, {0x3ae74b8, 0xc000650280}, {0x3aeb440?, 0xc0016e4560?}, {0xc0010ba1b0, 0x12}, {0x3afd260, 0xc000982000}, 0xc001c9c980) 2023-08-11T12:42:41.390589198Z github.com/cilium/cilium/pkg/proxy/proxy.go:459 +0xb7 2023-08-11T12:42:41.390596081Z github.com/cilium/cilium/pkg/endpoint.(*Endpoint).addVisibilityRedirects(0xc000982000, 0x1, 0xc001874ba0?, 0xc001c9c980?) 2023-08-11T12:42:41.390602613Z github.com/cilium/cilium/pkg/endpoint/bpf.go:343 +0x443 2023-08-11T12:42:41.390614345Z github.com/cilium/cilium/pkg/endpoint.(*Endpoint).addNewRedirects(0xc000982000, 0xc001874870?) 2023-08-11T12:42:41.390651325Z github.com/cilium/cilium/pkg/endpoint/bpf.go:424 +0x3c5 2023-08-11T12:42:41.390658068Z github.com/cilium/cilium/pkg/endpoint.(*Endpoint).runPreCompilationSteps(0xc000982000, 0xc000e31800, 0x0) 2023-08-11T12:42:41.390663999Z github.com/cilium/cilium/pkg/endpoint/bpf.go:802 +0x4fe 2023-08-11T12:42:41.390669690Z github.com/cilium/cilium/pkg/endpoint.(*Endpoint).regenerateBPF(0xc000982000, 0xc000e31800) 2023-08-11T12:42:41.390675451Z github.com/cilium/cilium/pkg/endpoint/bpf.go:542 +0x1a5 2023-08-11T12:42:41.390681112Z github.com/cilium/cilium/pkg/endpoint.(*Endpoint).regenerate(0xc000982000, 0xc000e31800) 2023-08-11T12:42:41.390686893Z github.com/cilium/cilium/pkg/endpoint/policy.go:467 +0x9c6 2023-08-11T12:42:41.390692564Z github.com/cilium/cilium/pkg/endpoint.(*EndpointRegenerationEvent).Handle(0xc000131b50, 0x0?) 2023-08-11T12:42:41.390698385Z github.com/cilium/cilium/pkg/endpoint/events.go:53 +0x325 2023-08-11T12:42:41.390704045Z github.com/cilium/cilium/pkg/eventqueue.(*EventQueue).run.func1() 2023-08-11T12:42:41.390709716Z github.com/cilium/cilium/pkg/eventqueue/eventqueue.go:245 +0x142 ``` Fixes: #27594 Signed-off-by: Tam Mach <tam.mach@cilium.io> Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
[ upstream commit 3f23ba7 ] This is to ensure that proxy must be enabled if Envoy L7 Load balancer feature is enabled. Signed-off-by: Tam Mach <tam.mach@cilium.io> Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
[ upstream commit 9389b2c ] Reported-by: Joe Stringer <joe@cilium.io> Signed-off-by: Martynas Pumputis <m@lambda.lt> Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
[ upstream commit e9e43fe ] This commit changes workflow's name fields to make them more human readable by adding spaces. Also some of the names was changed to be more consistent with each other Signed-off-by: Birol Bilgin <birol@cilium.io> Signed-off-by: Fabio Falzoi <fabio.falzoi@isovalent.com>
pippolo84
force-pushed
the
pr/v1.13-backport-2023-08-28
branch
from
2591489
to
46a69f5
Compare
|
Rebased to fix conflicts with target branch. |
|
/test-backport-1.13 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
policy.NewPolicyRepositoryin v1.13PRs skipped due to conflicts:
Once this PR is merged, you can update the PR labels via:
or with