Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cni): delegated gateway was not correctly injected (backport of #11922) #11926

Closed
wants to merge 1 commit into from
Closed

fix(cni): delegated gateway was not correctly injected (backport of #11922) #11926

wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 30, 2024

Automatic cherry-pick of #11922 for branch release-2.6

Generated by action

cherry-picked commit ebcc4be
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

On branch release-2.6
Your branch is up to date with 'origin/release-2.6'.

You are currently cherry-picking commit ebcc4be57.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.41.golden.yaml
	new file:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.41.input.yaml
	new file:   pkg/plugins/runtime/k8s/webhooks/injector/testdata/inject.sidecar-feature.41.golden.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pkg/plugins/runtime/k8s/webhooks/injector/injector.go
	both modified:   pkg/plugins/runtime/k8s/webhooks/injector/injector_test.go
	both modified:   test/framework/envs/multizone/env.go

@jakubdyszkiewicz @kumahq
fix(cni): delegated gateway was not correctly injected (#11922)
fbc8344 
I wanted to run Zone 2 in e2e tests in CNI mode and I encountered a
problem with injection.
We were injecting such init container
```
  initContainers:
  - name: ""
    resources: {}
```
I fixed it and switched one zone to CNI to avoid this in the future.

Inject container only if it's created

Placing run-full-matrix, because I need to see if all variants are ok. I
checked locally and e2e is fine with CNI.

Signed-off-by: Jakub Dyszkiewicz <[email protected]>
@kumahq kumahq bot requested a review from a team as a code owner October 30, 2024 11:49
@kumahq kumahq bot requested review from jakubdyszkiewicz and lobkovilya and removed request for a team October 30, 2024 11:49
@jakubdyszkiewicz
Copy link
Contributor

not a bug in this version and we also run zone 2 as cni

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jakubdyszkiewicz jakubdyszkiewicz Awaiting requested review from jakubdyszkiewicz jakubdyszkiewicz is a code owner automatically assigned from kumahq/kuma-maintainers

@lobkovilya lobkovilya Awaiting requested review from lobkovilya lobkovilya is a code owner automatically assigned from kumahq/kuma-maintainers

Assignees
No one assigned
Labels
conflict release-2.6
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jakubdyszkiewicz