fix(helm): remove duplicate annotation in ui deployment

gravitee-io/issues#9082
gravitee-io · Jun 8, 2023 · 3ec27d0 · 3ec27d0
1 parent 703a7a7
commit 3ec27d0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/helm/CHANGELOG.md b/helm/CHANGELOG.md
@@ -11,6 +11,8 @@ To ensure the compatibility between the APIM product and the APIM Helm Chart, th
 As of 3.20.11, the APIM Helm Chart will follow APIM release cycle.
 It means Helm Chart and APIM should always be aligned.
 
+- Remove duplicate annotation in ui deployment
+
 ### 3.19.16
 
 - Change APIM charts versioning
@@ -19,6 +21,8 @@ To ensure the compatibility between the APIM product and the APIM Helm Chart, th
 As of 3.19.16, the APIM Helm Chart will follow APIM release cycle.
 It means Helm Chart and APIM should always be aligned.
 
+- Remove duplicate annotation in ui deployment
+
 ### 3.18.27
 
 - Change APIM charts versioning
@@ -27,6 +31,8 @@ To ensure the compatibility between the APIM product and the APIM Helm Chart, th
 As of 3.18.27, the APIM Helm Chart will follow APIM release cycle.
 It means Helm Chart and APIM should always be aligned.
 
+- Remove duplicate annotation in ui deployment
+
 ### 3.2.0
 
 - Move Probes configuration under `deployment:`

diff --git a/helm/Chart.yaml b/helm/Chart.yaml
@@ -21,3 +21,4 @@ annotations:
   # https://artifacthub.io/packages/helm/graviteeio/apim?modal=changelog
   artifacthub.io/changes: |
     - Change the versioning
+    - Remove duplicate annotation in ui deployment
diff --git a/helm/templates/ui/ui-deployment.yaml b/helm/templates/ui/ui-deployment.yaml
@@ -79,12 +79,6 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
         {{- end }}
-      annotations:
-        {{- if .Values.common.annotations }}
-        {{- range $key, $value := .Values.common.annotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
-        {{- end }}
     spec:
       affinity: {{ toYaml .Values.ui.deployment.affinity | nindent 8 }}
       nodeSelector: {{ toYaml .Values.ui.deployment.nodeSelector | nindent 8 }}