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): port forward to service instead of pod of kuma-cp to improve test stability (backport of #11737) #11743

Merged
merged 3 commits into from
Oct 10, 2024
Merged

fix(e2e): port forward to service instead of pod of kuma-cp to improve test stability (backport of #11737) #11743

merged 3 commits into from
Oct 10, 2024

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Oct 9, 2024

Automatic cherry-pick of #11737 for branch release-2.5

Generated by action

cherry-picked commit 7129c94
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 7129c9496.
  (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/framework/k8s_controlplane.go

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

@Automaat @kumahq
fix(e2e): port forward to service instead of pod of kuma-cp to improv…
5950727 
…e test stability (#11737)

* fix(ci): port forward to service instead of pod of kuma-cp to improve test stability

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>

---------

Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>
@kumahq kumahq bot requested a review from a team as a code owner October 9, 2024 16:31
@kumahq kumahq bot requested review from slonka and jakubdyszkiewicz and removed request for a team October 9, 2024 16:31
@Automaat
chore(backport): fix conflict
7f839a5 
Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>
@Automaat Automaat removed the conflict label Oct 9, 2024
@slonka
Copy link
Contributor

slonka commented Oct 10, 2024 •
edited
Loading

[FAILED] Failed finding an available service, service:

:(

https://app.circleci.com/pipelines/github/kumahq/kuma/40660/workflows/d4887a0f-f15c-4e2d-a235-4d63c9d4f099/jobs/599706?utm_campaign=vcs-integration-link&utm_medium=referral&utm_source=github-checks-link&utm_content=summary

@Automaat
chore(backport): fix conflict
20e0df3 
Signed-off-by: Marcin Skalski <skalskimarcin33@gmail.com>
@Automaat
Copy link
Contributor

@slonka I've removed return from function by accident during conflict resolution, it should be fine now

@Automaat Automaat enabled auto-merge (squash) October 10, 2024 06:50
@Automaat Automaat merged commit 6420c84 into release-2.5 Oct 10, 2024
5 checks passed
@Automaat Automaat deleted the chore/backport-release-2.5-11737 branch October 10, 2024 07:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@slonka slonka slonka approved these changes

@Automaat Automaat Automaat 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.5
Projects
None yet
Milestone
No milestone
Development

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