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.

Sign up for GitHub

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(helm): use podAnnotations everywhere possible #4991

Merged
merged 1 commit into from
Sep 12, 2022
+2,979 −38
Merged

fix(helm): use podAnnotations everywhere possible #4991

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions UPGRADE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ does not have any particular instructions.
This component has been removed
after [a long period of deprecation](https://github.com/kumahq/kuma/issues/2851).

### Helm

`ingress.annotations` and `egress.annotations` are deprecated in favour of `ingress.podAnnotations` and `egress.podAnnotations` which is a better name and aligne with the existing `controlPlane.podAnnoations`.

## Upgrade to `1.8.x`

### Kumactl
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2167,7 +2167,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.cni-experimental-enabled.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2185,7 +2185,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
10 changes: 8 additions & 2 deletions app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,8 @@ cni:
# -- Node Selector for the CNI pods
nodeSelector:
kubernetes.io/os: linux
# -- Additional pod annotations
podAnnotations: { }

image:
# -- CNI image registry
Expand Down Expand Up @@ -444,8 +446,10 @@ ingress:
port: 10001
# -- Port on which service is exposed on Node for service of type NodePort
nodePort:
# -- Additional deployment annotation
# -- Additional pod annotations (deprecated favor `podAnnotations`)
annotations: { }
# -- Additional pod annotations
podAnnotations: { }
# -- Node Selector for the Ingress pods
nodeSelector:
kubernetes.io/os: linux
Expand Down Expand Up @@ -553,8 +557,10 @@ egress:
port: 10002
# -- Port on which service is exposed on Node for service of type NodePort
nodePort:
# -- Additional deployment annotation
# -- Additional pod annotations (deprecated favor `podAnnotations`)
annotations: { }
# -- Additional pod annotations
podAnnotations: { }
# -- Node Selector for the Egress pods
nodeSelector:
kubernetes.io/os: linux
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2006,7 +2006,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: fd5cb26395594662e1f976f50c10bee12480e1d1f27ab49903572bdc3bb43e7c

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.override-env-vars.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2119,7 +2119,6 @@ spec:
annotations:
checksum/config: 1ddb2793e3c20c70cd0520f7a4fde01d98a29f277eb94d778097c8d1c992128f
checksum/tls-secrets: 7f615c364a983efeb4034f3aa765835f7d5f11ca524e62608f396a8a92b824f6

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.registry.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion ...l/cmd/install/testdata/install-control-plane.tproxy-ebpf-experimental-enabled.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.with-egress.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.with-helm-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2051,7 +2051,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.with-helm-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2020,7 +2020,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-control-plane.zone.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-cp-helm/empty.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1989,7 +1989,6 @@ spec:
annotations:
checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd

labels:
app: kuma-control-plane
app.kubernetes.io/name: kuma
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-cp-helm/fix4485.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2011,7 +2011,6 @@ spec:
annotations:
checksum/config: a339f834847039f79aed19d73fd8903aeb736f152c512a641f4fb907dbad1429
checksum/tls-secrets: 6c59f080c0827192e886efb995ae009149bee063ab26e28eac17b70cfd7ae974

labels:
app: kuma-control-plane
"foo": "baz"
Expand Down
1 change: 0 additions & 1 deletion app/kumactl/cmd/install/testdata/install-cp-helm/fix4496.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2030,7 +2030,6 @@ spec:
annotations:
checksum/config: 8e3d9b7078c00005eae94f443d41866ae6d12b93b99888c865c01e843e16dd38
checksum/tls-secrets: 6a60bfebb565d14f3eb7deea8f96a8d4eb674254ab8a60c3e19e7ff761168e0b

labels:
app: kuma-control-plane
"foo": "bar"
Expand Down
Loading