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

chore(deps): change go-control-plane version (backport of #12000) #12027

Closed
wants to merge 1 commit into from
Closed

chore(deps): change go-control-plane version (backport of #12000) #12027

wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Nov 12, 2024

Automatic cherry-pick of #12000 for branch release-2.7

Generated by action

cherry-picked commit 9565a54
⚠️ ⚠️ ⚠️ Conflicts happened when cherry-picking! ⚠️ ⚠️ ⚠️

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

You are currently cherry-picking commit 9565a54ef.
  (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:   pkg/xds/envoy/imports.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum

@lukidzi @kumahq
chore(deps): change go-control-plane version (#12000)
b39bdec 
We aim to keep our fork of go-control-plane synchronized with the
upstream repository. We’ve documented our proposed steps in a
[MADR](https://docs.google.com/document/d/1n9hQkTubtODIJl_NThF0uvhcqXJo5OU-lU3X3N81hW4/edit?tab=t.0#heading=h.n6cmlf1eel2z),
which outlines the process we plan to follow.

I've created a release `v0.13.1-kong-1`, diverging from `v0.13.1`, so we
can use a version that includes our custom changes. The goal is to keep
our tags distinct from the upstream, so I plan to remove `v0.13.2` from
our fork to avoid confusion.

https://docs.google.com/document/d/1n9hQkTubtODIJl_NThF0uvhcqXJo5OU-lU3X3N81hW4/edit?tab=t.0#heading=h.n6cmlf1eel2z

Fix #XX

<!--
> Changelog: skip
-->
<!--
Uncomment the above section to explicitly set a [`> Changelog:` entry
here](https://github.com/kumahq/kuma/blob/master/CONTRIBUTING.md#submitting-a-patch)?
-->

Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
@kumahq kumahq bot requested a review from a team as a code owner November 12, 2024 11:44
@kumahq kumahq bot requested review from lobkovilya and Icarus9913 and removed request for a team November 12, 2024 11:44
@lukidzi lukidzi closed this Nov 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

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

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

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