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

fix(kuma-cp): avoid concurrent access on resource meta (backport of #11997) #12025

Closed kumahq[bot] closed 1 week ago

kumahq[bot] commented 1 week ago

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

Generated by action

cherry-picked commit c3d7187c7bd2f5b962ad533193eafa5582b0fb0d :warning: :warning: :warning: Conflicts happened when cherry-picking! :warning: :warning: :warning:

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

You are currently cherry-picking commit c3d7187c7.
  (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:   pkg/kds/util/meta.go
    both modified:   pkg/kds/util/resource.go
    both modified:   pkg/plugins/resources/memory/store.go
    both modified:   pkg/plugins/resources/remote/store.go
    both modified:   pkg/plugins/secrets/k8s/store.go

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