fix(chart): Update daemonset and deployment to not include annotation…

…s key unless populated (#45)
SwanseaUniversityMedical · Jan 3, 2024 · 575468e · 575468e
1 parent 397d746
commit 575468e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/charts/canary/templates/controller/daemonset.yaml b/charts/canary/templates/controller/daemonset.yaml
@@ -14,10 +14,12 @@ metadata:
     {{- range $key, $value := .Values.controller.labels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+  {{- if .Values.controller.annotations  }}
   annotations:
     {{- range $key, $value := .Values.controller.annotations }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+  {{- end }}
 
 spec:
 
@@ -45,14 +47,11 @@ spec:
         {{- range $key, $value := .Values.controller.labels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
-      {{- if or .Values.controller.annotations .Values.controller.podAnnotations  }}
+      {{- if .Values.controller.podAnnotations }}
       annotations:
         {{- range $key, $value := .Values.controller.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
-        {{- range $key, $value := .Values.controller.annotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
       {{- end }}
 
     spec:

diff --git a/charts/canary/templates/controller/deployment.yaml b/charts/canary/templates/controller/deployment.yaml
@@ -14,10 +14,12 @@ metadata:
     {{- range $key, $value := .Values.controller.labels }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+  {{- if .Values.controller.annotations  }}    
   annotations:
     {{- range $key, $value := .Values.controller.annotations }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
+  {{- end }}
 
 spec:
   replicas: {{ .Values.controller.deployment.replicas }}
@@ -39,14 +41,11 @@ spec:
         {{- range $key, $value := .Values.controller.labels }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
-      {{- if or .Values.controller.annotations .Values.controller.podAnnotations  }}
+      {{- if .Values.controller.podAnnotations  }}
       annotations:
         {{- range $key, $value := .Values.controller.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
-        {{- range $key, $value := .Values.controller.annotations }}
-        {{ $key }}: {{ $value | quote }}
-        {{- end }}
       {{- end }}
 
     spec: