search

kumahq / kuma

🐻 The multi-zone service mesh for containers, Kubernetes and VMs. Built with Envoy. CNCF Sandbox Project.
https://kuma.io/install
Apache License 2.0
3.67k stars 333 forks source link

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

Closed kumahq[bot] closed 1 week ago

kumahq[bot] commented 1 week ago

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

Generated by action

cherry-picked commit 9565a54ef35f656471035e5e0e42bf01a61d7976 :warning: :warning: :warning: Conflicts happened when cherry-picking! :warning: :warning: :warning:

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

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