chore(helm): remove duplicate keys in resources #4681
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`kuma.egressLabels` and `kuma.ingressLabels` already include `kuma.selectorLabels`. The first `Service` `selector` was being overwritten anyway. Signed-off-by: Mike Beaumont <[email protected]>
Codecov Report
@@ Coverage Diff @@
## master #4681 +/- ##
==========================================
- Coverage 46.48% 46.48% -0.01%
==========================================
Files 684 684
Lines 46500 46500
==========================================
- Hits 21617 21614 -3
- Misses 22973 22975 +2
- Partials 1910 1911 +1
Continue to review full report at Codecov.
|
|
@Mergifyio backport release-1.7 release-1.6 release-1.5 |
|
Needs this to be able to backport: #5592 |
mergify bot
pushed a commit
that referenced
this pull request
Jan 11, 2023
`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)
mergify bot
pushed a commit
that referenced
this pull request
Jan 11, 2023
`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 bot
pushed a commit
that referenced
this pull request
Jan 11, 2023
`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
✅ Backports have been created
|
lahabana
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) Co-authored-by: Mike Beaumont <[email protected]>
lahabana
added 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]>
lahabana
added 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]>
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
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
kuma.egressLabelsandkuma.ingressLabelsalready includekuma.selectorLabels. The firstServiceselectorwas beingoverwritten anyway.
Blocking #4671 but I think this should be an explicit PR.
Checklist prior to review
UPGRADE.md? --