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.

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

fix(MeshTrace): invalid sampling default values (backport of #11548) #11554

Closed
wants to merge 1 commit into from

Conversation

kumahq[bot]
Copy link
Contributor

@kumahq kumahq bot commented Sep 25, 2024

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

Generated by action

cherry-picked commit 79a2389
⚠️ ⚠️ ⚠️ 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 79a23897c.
  (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:   app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
	both modified:   app/kumactl/cmd/install/testdata/install-control-plane.gateway-api-present.yaml
	both modified:   app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
	both modified:   app/kumactl/cmd/install/testdata/install-crds.all.golden.yaml
	both modified:   deployments/charts/kuma/crds/kuma.io_meshtraces.yaml
	both modified:   docs/generated/openapi.yaml
	both modified:   docs/generated/raw/crds/kuma.io_meshtraces.yaml
	both modified:   pkg/plugins/policies/meshtrace/api/v1alpha1/meshtrace.go
	both modified:   pkg/plugins/policies/meshtrace/api/v1alpha1/schema.yaml
	both modified:   pkg/plugins/policies/meshtrace/k8s/crd/kuma.io_meshtraces.yaml

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

Signed-off-by: Mike Beaumont <mjboamail@gmail.com>
@kumahq kumahq bot requested a review from a team as a code owner September 25, 2024 08:41
@kumahq kumahq bot requested review from slonka and jakubdyszkiewicz and removed request for a team September 25, 2024 08:41
@lahabana lahabana deleted the chore/backport-release-2.5-11548 branch October 28, 2024 16:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant