Optional Annotations Fix (#354)

Author: NaveLevi

.deploy/cf-runtime/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: A Helm chart for Codefresh Runner
 name: cf-runtime
-version: 1.0.8
+version: 1.0.9
 home: https://github.com/codefresh-io/venona
 kubeVersion: '>=1.19.0-0'
 keywords:

.deploy/cf-runtime/README.md

@@ -1,6 +1,6 @@
 ## Codefresh Runner
 
-![Version: 1.0.8](https://img.shields.io/badge/Version-1.0.8-informational?style=flat-square)
+![Version: 1.0.9](https://img.shields.io/badge/Version-1.0.9-informational?style=flat-square)
 
 ## Prerequisites
 

.deploy/cf-runtime/templates/monitor/rollback-serviceaccount.monitor.yaml

@@ -4,8 +4,8 @@ kind: ServiceAccount
 metadata:
   name: {{ include "cf-monitor.rollbackFullname" . }}
   labels: {{- include "cf-monitor.labels" . | nindent 4 }}
+  {{- with .Values.monitor.serviceAccount.annotations }}
   annotations:
-    {{ range $key, $value := .Values.monitor.serviceAccount.annotations }}
-    {{ $key }}: {{ $value }}
-    {{ end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
 {{- end }}

.deploy/cf-runtime/templates/monitor/service-account.monitor.yaml

@@ -4,8 +4,8 @@ kind: ServiceAccount
 metadata:
   name: {{ include "cf-monitor.fullname" . }}
   labels: {{- include "cf-monitor.labels" . | nindent 4 }}
+  {{- with .Values.monitor.serviceAccount.annotations }}
   annotations:
-    {{ range $key, $value := .Values.monitor.serviceAccount.annotations }}
-    {{ $key }}: {{ $value }}
-    {{ end }}
-{{- end }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+{{- end }}

.deploy/cf-runtime/templates/re/service-account.re.yaml

@@ -4,9 +4,7 @@ metadata:
   {{- /* has to be a constant */}}
   name: codefresh-engine
   labels: {{- include "cf-re.labels" . | nindent 4 }}
-{{- if .Values.re.serviceAccount }}
-  annotations: 
-    {{- range $key, $value := .Values.re.serviceAccount.annotations }}
-    {{ $key }}: {{ $value }}
-    {{- end}}
-{{- end}}
+  {{- with .Values.re.serviceAccount.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}

.deploy/cf-runtime/templates/venona/deployment.runner.yaml

@@ -16,10 +16,10 @@ spec:
   template:
     metadata:
       labels: {{- include "cf-runner.labels" . | nindent 8 }}
+      {{- with .Values.runner.annotations }}
       annotations:
-        {{- range $key, $value := .Values.runner.annotations }}
-        {{ $key }}: {{ $value }}
-        {{- end}}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ include "cf-runner.fullname" . }}
       {{- if .Values.runner.nodeSelector }}

.deploy/cf-runtime/templates/volume-provisioner/deployment.dind-volume-provisioner.vp.yaml

@@ -12,10 +12,10 @@ spec:
   template:
     metadata:
       labels: {{- include "cf-vp.provisionerLabels" . | nindent 9 }}
+      {{- with .Values.volumeProvisioner.annotations }}
       annotations:
-        {{- range $key, $value := .Values.volumeProvisioner.annotations }}
-        {{ $key }}: {{ $value }}
-        {{- end}}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ include "cf-vp.fullname" . }}
       {{- if .Values.volumeProvisioner.nodeSelector }}

.deploy/cf-runtime/templates/volume-provisioner/service-account.dind-volume-provisioner.vp.yaml

@@ -3,9 +3,7 @@ kind: ServiceAccount
 metadata:
   name: {{ include "cf-vp.fullname" . }}
   labels: {{- include "cf-vp.provisionerLabels" . | nindent 4 }}
+  {{- with .Values.volumeProvisioner.serviceAccount.annotations }}
   annotations:
-{{- if .Values.volumeProvisioner.serviceAccount }}
-    {{- range $key, $value := .Values.volumeProvisioner.serviceAccount.annotations }}
-    {{ $key }}: {{ $value }}
-    {{- end}}
-{{- end}}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}