Remove unnecessary helm-release-version annotation (linkerd#11329)

from destination and proxy-injector Fixes linkerd#10778 Signed-off-by: Takumi Sue <[email protected]> Signed-off-by: Adam Shaw <[email protected]>
adamshawvipps · Sep 18, 2023 · 9536fff · 9536fff
1 parent 1fd44d8
commit 9536fff
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 14 deletions.
diff --git 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
@@ -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
diff --git a/cli/cmd/testdata/install_helm_control_plane_output_ha.golden b/cli/cmd/testdata/install_helm_control_plane_output_ha.golden
diff --git a/cli/cmd/testdata/install_helm_output_ha_labels.golden b/cli/cmd/testdata/install_helm_output_ha_labels.golden
diff --git a/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden b/cli/cmd/testdata/install_helm_output_ha_namespace_selector.golden