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(e2e): don't reuse namespace for helm upgrade test (backport of #11539) #12314

Merged
merged 2 commits into from
Dec 18, 2024
Merged

fix(e2e): don't reuse namespace for helm upgrade test (backport of #11539) #12314

merged 2 commits into from
Dec 18, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Dec 17, 2024

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

Generated by action

cherry-picked commit 7d80a5a
⚠️ ⚠️ ⚠️ 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 7d80a5ab5.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/helm/kuma_helm_upgrade_multizone.go

no changes added to commit (use "git add" and/or "git commit -a")

@Automaat @kumahq
fix(e2e): don't reuse namespace for helm upgrade test (#11539)
a963a02 
---------

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>
@kumahq kumahq bot requested a review from a team as a code owner December 17, 2024 15:12
@kumahq kumahq bot added the conflict label Dec 17, 2024
@kumahq kumahq bot removed the request for review from a team December 17, 2024 15:12
@kumahq kumahq bot added the release-2.6 label Dec 17, 2024
@kumahq kumahq bot requested review from slonka and jakubdyszkiewicz December 17, 2024 15:12
slonka
slonka reviewed Dec 17, 2024
View reviewed changes
Copy link
Contributor

@slonka slonka left a comment

Choose a reason for hiding this comment

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

needs resolving cherry pick conflicts

@lukidzi
resolve
312485d 
Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
@lukidzi lukidzi removed the conflict label Dec 17, 2024
@lukidzi lukidzi merged commit deaf468 into release-2.6 Dec 18, 2024
12 checks passed
@lukidzi lukidzi deleted the chore/backport-release-2.6-11539 branch December 18, 2024 08:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slonka slonka slonka left review comments

@lukidzi lukidzi lukidzi approved these changes

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

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

Successfully merging this pull request may close these issues.
3 participants
@slonka @lukidzi @Automaat