refactor(occm): define helper template for podAnnotations

kubernetes · Feb 14, 2024 · b9fe10a · b9fe10a
1 parent 6431311
commit b9fe10a
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/charts/openstack-cloud-controller-manager/templates/_helpers.tpl b/charts/openstack-cloud-controller-manager/templates/_helpers.tpl
@@ -43,11 +43,24 @@ component: controllermanager
 {{- define "occm.controllermanager.labels" -}}
 {{ include "occm.controllermanager.matchLabels" . }}
 {{ include "occm.common.metaLabels" . }}
-{{- range $key, $val := .Values.podLabels }}
-{{ $key }}: {{ $val }}
+{{ if .Values.podLabels }}
+{{- toYaml .Values.podLabels }}
 {{- end }}
 {{- end -}}
 
+{{/*
+Common annotations and pod annotations
+*/}}
+{{- define "occm.controllermanager.annotations" -}}
+{{- if .Values.commonAnnotations }}
+{{- toYaml .Values.commonAnnotations }}
+{{- end }}
+{{ if .Values.podAnnotations }}
+{{- toYaml .Values.podAnnotations }}
+{{- end }}
+{{- end -}}
+
+
 {{/*
 Create cloud-config makro.
 */}}

diff --git a/charts/openstack-cloud-controller-manager/templates/daemonset.yaml b/charts/openstack-cloud-controller-manager/templates/daemonset.yaml
@@ -19,12 +19,7 @@ spec:
     metadata:
       annotations:
         checksum/config: {{ include "cloudConfig" . | sha256sum }}
-        {{- with .Values.commonAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
+        {{- include "occm.controllermanager.annotations" . | nindent 8 }}
       labels:
         {{- include "occm.controllermanager.labels" . | nindent 8 }}
     spec: