fix(helm): use podAnnotations everywhere possible (#4991)

- Deprecated `annotations` everywhere in favour of `podAnnotations` - Add test to validate all `annotations` values - Add `cni.podAnnotations` - Add README for helm chart tests Fix #4935 Signed-off-by: Charly Molter <charly.molter@konghq.com> Co-authored-by: Deepak Mohandas <deepak.mohandas@konghq.com> (cherry picked from commit c5223c8) # Conflicts: # UPGRADE.md # app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml # app/kumactl/cmd/install/testdata/install-control-plane.cni-experimental-enabled.golden.yaml # app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml # app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml # app/kumactl/cmd/install/testdata/install-control-plane.override-env-vars.golden.yaml # app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml # app/kumactl/cmd/install/testdata/install-control-plane.registry.golden.yaml # app/kumactl/cmd/install/testdata/install-control-plane.tproxy-ebpf-experimental-enabled.golden.yaml # 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-helm-values.yaml # app/kumactl/cmd/install/testdata/install-control-plane.with-ingress.golden.yaml # app/kumactl/cmd/install/testdata/install-control-plane.zone.golden.yaml # app/kumactl/cmd/install/testdata/install-cp-helm/empty.golden.yaml # app/kumactl/cmd/install/testdata/install-cp-helm/fix4485.golden.yaml # app/kumactl/cmd/install/testdata/install-cp-helm/fix4496.golden.yaml
kumahq · Oct 5, 2022 · 612c431 · 612c431
1 parent 709620c
commit 612c431
Show file tree

Hide file tree

Showing 28 changed files with 5,423 additions and 22 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -8,6 +8,20 @@ does not have any particular instructions.
 
 ## Upcoming release
 
+<<<<<<< HEAD
+=======
+### `kuma-prometheus-sd`
+
+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`
+
+>>>>>>> c5223c833 (fix(helm): use `podAnnotations` everywhere possible (#4991))
 ### Kumactl
 
 * `kumactl inspect dataplane --config-dump` was deprecated in favour of `kumactl inspect dataplane --type config-dump`. The behaviour of the new flag is unchanged but you should migrate.

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.cni-enabled.golden.yaml
@@ -2039,8 +2039,12 @@ spec:
     metadata:
       annotations:
         checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
+<<<<<<< HEAD
         checksum/tls-secrets: c18b5a13b515430c78db0471417d72df2b8f0a38f63eccc5ba15ea98469dc670
 
+=======
+        checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd
+>>>>>>> c5223c833 (fix(helm): use `podAnnotations` everywhere possible (#4991))
       labels: 
         app: kuma-control-plane
         app.kubernetes.io/name: kuma

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.cni-experimental-enabled.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.cni-experimental-enabled.golden.yaml
@@ -2057,8 +2057,12 @@ spec:
     metadata:
       annotations:
         checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
+<<<<<<< HEAD
         checksum/tls-secrets: c18b5a13b515430c78db0471417d72df2b8f0a38f63eccc5ba15ea98469dc670
 
+=======
+        checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd
+>>>>>>> c5223c833 (fix(helm): use `podAnnotations` everywhere possible (#4991))
       labels: 
         app: kuma-control-plane
         app.kubernetes.io/name: kuma

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.defaults.golden.yaml
@@ -1860,8 +1860,12 @@ spec:
     metadata:
       annotations:
         checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
+<<<<<<< HEAD
         checksum/tls-secrets: c18b5a13b515430c78db0471417d72df2b8f0a38f63eccc5ba15ea98469dc670
 
+=======
+        checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd
+>>>>>>> c5223c833 (fix(helm): use `podAnnotations` everywhere possible (#4991))
       labels: 
         app: kuma-control-plane
         app.kubernetes.io/name: kuma

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.dump-values.yaml
@@ -311,6 +311,8 @@ cni:
   # -- Node Selector for the CNI pods
   nodeSelector:
     kubernetes.io/os: linux
+  # -- Additional pod annotations
+  podAnnotations: { }
 
   image:
     # -- CNI image registry
@@ -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
@@ -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

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.global.golden.yaml
@@ -1877,8 +1877,12 @@ spec:
     metadata:
       annotations:
         checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
+<<<<<<< HEAD
         checksum/tls-secrets: 7162cb2f6f12d981de82e4d96daf3b866b573ba9941f420003e68ae1d713ba52
 
+=======
+        checksum/tls-secrets: fd5cb26395594662e1f976f50c10bee12480e1d1f27ab49903572bdc3bb43e7c
+>>>>>>> c5223c833 (fix(helm): use `podAnnotations` everywhere possible (#4991))
       labels: 
         app: kuma-control-plane
         app.kubernetes.io/name: kuma

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.override-env-vars.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.override-env-vars.golden.yaml
@@ -1860,8 +1860,12 @@ spec:
     metadata:
       annotations:
         checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
+<<<<<<< HEAD
         checksum/tls-secrets: c18b5a13b515430c78db0471417d72df2b8f0a38f63eccc5ba15ea98469dc670
 
+=======
+        checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd
+>>>>>>> c5223c833 (fix(helm): use `podAnnotations` everywhere possible (#4991))
       labels: 
         app: kuma-control-plane
         app.kubernetes.io/name: kuma

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.overrides.golden.yaml
@@ -1990,8 +1990,12 @@ spec:
     metadata:
       annotations:
         checksum/config: 1ddb2793e3c20c70cd0520f7a4fde01d98a29f277eb94d778097c8d1c992128f
+<<<<<<< HEAD
         checksum/tls-secrets: 5b3dd63d42b0e6d365c6994bd5a8ba510930dbd2210faed54076f103fede067c
 
+=======
+        checksum/tls-secrets: 7f615c364a983efeb4034f3aa765835f7d5f11ca524e62608f396a8a92b824f6
+>>>>>>> c5223c833 (fix(helm): use `podAnnotations` everywhere possible (#4991))
       labels: 
         app: kuma-control-plane
         app.kubernetes.io/name: kuma

diff --git a/app/kumactl/cmd/install/testdata/install-control-plane.registry.golden.yaml b/app/kumactl/cmd/install/testdata/install-control-plane.registry.golden.yaml
@@ -1860,8 +1860,12 @@ spec:
     metadata:
       annotations:
         checksum/config: c52be51867deb8823a422dc1d188c7a2ab7fc5e501f620467d7fdd8fc4637d47
+<<<<<<< HEAD
         checksum/tls-secrets: c18b5a13b515430c78db0471417d72df2b8f0a38f63eccc5ba15ea98469dc670
 
+=======
+        checksum/tls-secrets: 0f778cb0c1f035e562a58b0fac0af5eb78fa2ed5d89f26c9e7968d50cea2a1dd
+>>>>>>> c5223c833 (fix(helm): use `podAnnotations` everywhere possible (#4991))
       labels: 
         app: kuma-control-plane
         app.kubernetes.io/name: kuma