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.

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

test(e2e): upgrade KIC (backport of #9157) #12348

Merged
merged 2 commits into from
Dec 19, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Dec 19, 2024

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

Generated by action

cherry-picked commit 6cf0b3e
⚠️ ⚠️ ⚠️ 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 6cf0b3eea.
  (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:
	modified:   test/e2e_env/kubernetes/gateway/delegated.go
	modified:   test/e2e_env/kubernetes/kic/kong_ingress.go
	modified:   test/e2e_env/kubernetes/kubernetes_suite_test.go
	modified:   test/framework/deployments/kic/deployment.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   test/e2e_env/kubernetes/gateway/delegated_meshproxypatch.go
	both modified:   test/framework/deployments/kic/kubernetes.go

Signed-off-by: Jakub Dyszkiewicz <[email protected]>
@kumahq kumahq bot requested a review from a team as a code owner December 19, 2024 15:33
@kumahq kumahq bot requested review from michaelbeaumont and slonka and removed request for a team December 19, 2024 15:33
Signed-off-by: Lukasz Dziedziak <[email protected]>
@lukidzi lukidzi removed the conflict label Dec 19, 2024
@lukidzi lukidzi merged commit 3ea2f55 into release-2.6 Dec 19, 2024
12 checks passed
@lukidzi lukidzi deleted the chore/backport-release-2.6-9157 branch December 19, 2024 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants