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

chore(helm): remove duplicate keys in resources (backport #4681) #5642

Merged
merged 2 commits into from
Jan 11, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 11, 2023

This is an automatic backport of pull request #4681 done by Mergify.
Cherry-pick of 610662a has failed:

On branch mergify/bp/release-1.5/pr-4681
Your branch is up to date with 'origin/release-1.5'.

You are currently cherry-picking commit 610662ae0.
  (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:   app/kumactl/cmd/install/testdata/install-tracing.defaults.golden.yaml
	modified:   app/kumactl/cmd/install/testdata/install-tracing.overrides.golden.yaml
	modified:   app/kumactl/data/install/k8s/tracing/jaeger/all-in-one-template.yaml

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   app/kumactl/cmd/install/testdata/install-control-plane.with-egress.golden.yaml
	deleted by us:   app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
	both modified:   app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml
	deleted by us:   app/kumactl/cmd/install/testdata/install-cp-helm/fix4496.golden.yaml
	deleted by us:   app/kumactl/cmd/install/testdata/install-observability.defaults.golden.yaml
	deleted by us:   app/kumactl/cmd/install/testdata/install-observability.no-grafana.golden.yaml
	deleted by us:   app/kumactl/cmd/install/testdata/install-observability.no-loki.golden.yaml
	deleted by us:   app/kumactl/cmd/install/testdata/install-observability.no-prometheus.golden.yaml
	deleted by us:   app/kumactl/cmd/install/testdata/install-observability.overrides.golden.yaml
	deleted by us:   app/kumactl/data/install/k8s-deprecated/tracing/jaeger/all-in-one-template.yaml
	both modified:   deployments/charts/kuma/templates/egress-deployment.yaml
	both modified:   deployments/charts/kuma/templates/ingress-deployment.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

`kuma.egressLabels` and `kuma.ingressLabels` already include
`kuma.selectorLabels`. The first `Service` `selector` was being
overwritten anyway.

Signed-off-by: Mike Beaumont <[email protected]>
(cherry picked from commit 610662a)

# Conflicts:
#	app/kumactl/cmd/install/testdata/install-control-plane.with-egress.golden.yaml
#	app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
#	app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml
#	app/kumactl/cmd/install/testdata/install-cp-helm/fix4496.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.defaults.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.no-grafana.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.no-loki.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.no-prometheus.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.overrides.golden.yaml
#	app/kumactl/data/install/k8s-deprecated/tracing/jaeger/all-in-one-template.yaml
#	deployments/charts/kuma/templates/egress-deployment.yaml
#	deployments/charts/kuma/templates/ingress-deployment.yaml
@mergify mergify bot requested a review from a team as a code owner January 11, 2023 10:56
@mergify mergify bot added the conflicts label Jan 11, 2023
Signed-off-by: Charly Molter <[email protected]>
@lahabana lahabana force-pushed the mergify/bp/release-1.5/pr-4681 branch from d850acd to 398caed Compare January 11, 2023 12:14
@lahabana lahabana enabled auto-merge (squash) January 11, 2023 12:14
@lahabana lahabana merged commit 64c966a into release-1.5 Jan 11, 2023
@lahabana lahabana deleted the mergify/bp/release-1.5/pr-4681 branch January 11, 2023 14:29
lukidzi pushed a commit that referenced this pull request Jan 11, 2023
* chore(helm): remove duplicate keys in resources (#4681)

`kuma.egressLabels` and `kuma.ingressLabels` already include
`kuma.selectorLabels`. The first `Service` `selector` was being
overwritten anyway.

Signed-off-by: Mike Beaumont <[email protected]>
(cherry picked from commit 610662a)

# Conflicts:
#	app/kumactl/cmd/install/testdata/install-control-plane.with-egress.golden.yaml
#	app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
#	app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml
#	app/kumactl/cmd/install/testdata/install-cp-helm/fix4496.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.defaults.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.no-grafana.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.no-loki.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.no-prometheus.golden.yaml
#	app/kumactl/cmd/install/testdata/install-observability.overrides.golden.yaml
#	app/kumactl/data/install/k8s-deprecated/tracing/jaeger/all-in-one-template.yaml
#	deployments/charts/kuma/templates/egress-deployment.yaml
#	deployments/charts/kuma/templates/ingress-deployment.yaml

* fix conflicts

Signed-off-by: Charly Molter <[email protected]>

Signed-off-by: Charly Molter <[email protected]>
Co-authored-by: Mike Beaumont <[email protected]>
Co-authored-by: Charly Molter <[email protected]>
Signed-off-by: Lukasz Dziedziak <[email protected]>
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.

2 participants