Dont include imagePullSecret with empty name in service chart. (#199)

* Dont include imagePullSecret if there is no imagePullSecret set

* Update router and web-ui as well

* Keep at version 1.0.1 for all charts

Author: ecolternv

deployments/charts/quick-start/Chart.yaml

@@ -32,7 +32,7 @@ dependencies:
   version: 1.0.1
   repository: file://../web-ui
 - name: router
-  version: 1.0.0
+  version: 1.0.1
   repository: file://../router
 - name: backend-operator
   version: 1.0.1

deployments/charts/router/Chart.yaml

@@ -30,7 +30,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.0
+version: 1.0.1
 
 
 # This is the version number of the application being deployed. This version number should be

deployments/charts/router/templates/router-service.yaml

@@ -63,8 +63,10 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.global.imagePullSecret }}
       imagePullSecrets:
       - name: {{ .Values.global.imagePullSecret }}
+      {{- end }}
       serviceAccountName: {{ .Values.services.service.serviceAccountName | default "default" }}
       {{- with .Values.services.service.initContainers }}
       initContainers:

deployments/charts/service/templates/agent-service.yaml

@@ -62,8 +62,10 @@ spec:
         {{- end}}
       tolerations:
       {{ toYaml .Values.services.agent.tolerations | nindent 8 }}
+      {{- if .Values.global.imagePullSecret }}
       imagePullSecrets:
       - name: {{ .Values.global.imagePullSecret }}
+      {{- end }}
       serviceAccountName: {{ include "osmo.service-account-name" (dict "serviceAccountName" .Values.services.agent.serviceAccountName "Values" .Values) }}
       {{- with .Values.services.agent.initContainers }}
       initContainers:

deployments/charts/service/templates/api-service.yaml

@@ -61,8 +61,10 @@ spec:
         {{- end}}
       tolerations:
       {{ toYaml .Values.services.service.tolerations | nindent 8 }}
+      {{- if .Values.global.imagePullSecret }}
       imagePullSecrets:
       - name: {{ .Values.global.imagePullSecret }}
+      {{- end }}
       serviceAccountName: {{ include "osmo.service-account-name" (dict "serviceAccountName" .Values.services.service.serviceAccountName "Values" .Values) }}
       {{- with .Values.services.service.initContainers }}
       initContainers:

deployments/charts/service/templates/delayed-job-monitor.yaml

@@ -43,8 +43,10 @@ spec:
         {{- end}}
       tolerations:
       {{ toYaml .Values.services.delayedJobMonitor.tolerations | nindent 8 }}
+      {{- if .Values.global.imagePullSecret }}
       imagePullSecrets:
       - name: {{ .Values.global.imagePullSecret }}
+      {{- end }}
       serviceAccountName: {{ include "osmo.service-account-name" (dict "serviceAccountName" .Values.services.delayedJobMonitor.serviceAccountName "Values" .Values) }}
       {{- with .Values.services.delayedJobMonitor.initContainers }}
       initContainers:

deployments/charts/service/templates/logger-service.yaml

@@ -62,8 +62,10 @@ spec:
         {{- end}}
       tolerations:
       {{ toYaml .Values.services.logger.tolerations | nindent 8 }}
+      {{- if .Values.global.imagePullSecret }}
       imagePullSecrets:
       - name: {{ .Values.global.imagePullSecret }}
+      {{- end }}
       serviceAccountName: {{ include "osmo.service-account-name" (dict "serviceAccountName" .Values.services.logger.serviceAccountName "Values" .Values) }}
       {{- with .Values.services.logger.initContainers }}
       initContainers:

deployments/charts/service/templates/worker.yaml

@@ -54,8 +54,10 @@ spec:
         {{- end}}
       tolerations:
       {{ toYaml .Values.services.worker.tolerations | nindent 8 }}
+      {{- if .Values.global.imagePullSecret }}
       imagePullSecrets:
       - name: {{ .Values.global.imagePullSecret }}
+      {{- end }}
       serviceAccountName: {{ include "osmo.service-account-name" (dict "serviceAccountName" .Values.services.worker.serviceAccountName "Values" .Values) }}
       {{- with .Values.services.worker.initContainers }}
       initContainers:

deployments/charts/web-ui/templates/ui.yaml

@@ -60,8 +60,10 @@ spec:
         {{- end}}
       tolerations:
       {{ toYaml .Values.services.ui.tolerations | nindent 8 }}
+      {{- if .Values.global.imagePullSecret }}
       imagePullSecrets:
       - name: {{ .Values.global.imagePullSecret }}
+      {{- end }}
       {{- if .Values.services.ui.initContainers }}
       initContainers:
         {{- toYaml .Values.services.ui.initContainers | nindent 6 }}