From 1dc2603f60bee39198b5848c4b9d762f8b8a3c6e Mon Sep 17 00:00:00 2001 From: Takumi Sue <23391543+mikutas@users.noreply.github.com> Date: Tue, 12 Sep 2023 04:51:05 +0900 Subject: [PATCH] Remove unnecessary helm-release-version annotation (#11329) from destination and proxy-injector Fixes #10778 Signed-off-by: Takumi Sue --- charts/linkerd-control-plane/templates/destination.yaml | 3 --- charts/linkerd-control-plane/templates/proxy-injector.yaml | 3 --- cli/cmd/testdata/install_helm_control_plane_output.golden | 2 -- cli/cmd/testdata/install_helm_control_plane_output_ha.golden | 2 -- cli/cmd/testdata/install_helm_output_ha_labels.golden | 2 -- .../testdata/install_helm_output_ha_namespace_selector.golden | 2 -- 6 files changed, 14 deletions(-) diff --git a/charts/linkerd-control-plane/templates/destination.yaml b/charts/linkerd-control-plane/templates/destination.yaml index bac00ea27563f..ffa8da52ea576 100644 --- a/charts/linkerd-control-plane/templates/destination.yaml +++ b/charts/linkerd-control-plane/templates/destination.yaml @@ -153,9 +153,6 @@ spec: template: metadata: annotations: - {{- if empty .Values.cliVersion }} - linkerd.io/helm-release-version: {{.Release.Revision | quote}} - {{- end }} {{ include "partials.annotations.created-by" . }} {{- include "partials.proxy.annotations" . | nindent 8}} {{- with .Values.podAnnotations }}{{ toYaml . | trim | nindent 8 }}{{- end }} diff --git a/charts/linkerd-control-plane/templates/proxy-injector.yaml b/charts/linkerd-control-plane/templates/proxy-injector.yaml index de35d78604551..336d6064696ee 100644 --- a/charts/linkerd-control-plane/templates/proxy-injector.yaml +++ b/charts/linkerd-control-plane/templates/proxy-injector.yaml @@ -32,9 +32,6 @@ spec: template: metadata: annotations: - {{- if empty .Values.cliVersion }} - linkerd.io/helm-release-version: {{.Release.Revision | quote}} - {{- end }} {{ include "partials.annotations.created-by" . }} {{- include "partials.proxy.annotations" . | nindent 8}} {{- with .Values.podAnnotations }}{{ toYaml . | trim | nindent 8 }}{{- end }} diff --git a/cli/cmd/testdata/install_helm_control_plane_output.golden b/cli/cmd/testdata/install_helm_control_plane_output.golden index 246eab695938b..b440c9741803a 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output.golden @@ -1176,7 +1176,6 @@ spec: template: metadata: annotations: - linkerd.io/helm-release-version: "0" linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" @@ -1605,7 +1604,6 @@ spec: template: metadata: annotations: - linkerd.io/helm-release-version: "0" linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden index d3d9307fcf170..2cd6a3cc30a35 100644 --- a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden +++ b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden @@ -1274,7 +1274,6 @@ spec: template: metadata: annotations: - linkerd.io/helm-release-version: "0" linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" @@ -1739,7 +1738,6 @@ spec: template: metadata: annotations: - linkerd.io/helm-release-version: "0" linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden index cb1688b9a745f..9acc79073a3e9 100644 --- a/cli/cmd/testdata/install_helm_output_ha_labels.golden +++ b/cli/cmd/testdata/install_helm_output_ha_labels.golden @@ -1282,7 +1282,6 @@ spec: template: metadata: annotations: - linkerd.io/helm-release-version: "0" linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" @@ -1755,7 +1754,6 @@ spec: template: metadata: annotations: - linkerd.io/helm-release-version: "0" linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden index 42da2b22344d1..e65be022cb6de 100644 --- a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden +++ b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden @@ -1264,7 +1264,6 @@ spec: template: metadata: annotations: - linkerd.io/helm-release-version: "0" linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true" @@ -1729,7 +1728,6 @@ spec: template: metadata: annotations: - linkerd.io/helm-release-version: "0" linkerd.io/created-by: linkerd/helm linkerd-version linkerd.io/proxy-version: test-proxy-version cluster-autoscaler.kubernetes.io/safe-to-evict: "true"