[#2581513] Improved infra to be more generic

Author: amrityamrout

deployment/kubernetes/charts/resc-rabbitmq/templates/rabbitmq_statefulset.yaml

@@ -78,11 +78,12 @@ spec:
             - mountPath: "/var/lib/rabbitmq/mnesia"
               subPath: "var/lib/rabbitmq/mnesia"
               name: {{ .Values.global.appName }}-mq-pv-storage
-            {{ if eq .Values.useKubernetesSecret "false"}}
+            {{- $additionalVolumeMounts := include "resc.mqAdditionalVolumeMounts" . }}
+            {{- if $additionalVolumeMounts }}
             {{- with include "resc.mqAdditionalVolumeMounts" .}}
               {{- nindent 12 .}}
             {{- end }}
-            {{ end }}
+            {{- end }}
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: false

deployment/kubernetes/charts/resc-redis/templates/redis_deployement.yaml

@@ -56,11 +56,12 @@ spec:
           name: data
         - mountPath: /redis-master
           name: config
-        {{ if eq .Values.useKubernetesSecret "false"}}
+        {{- $additionalVolumeMounts := include "resc.redisAdditionalVolumeMounts" . }}
+        {{- if $additionalVolumeMounts }}
         {{- with include "resc.redisAdditionalVolumeMounts" .}}
           {{- nindent 8 .}}
         {{- end }}
-        {{ end }}
+        {{- end }}
       volumes:
         - name: data
           emptyDir: {}
@@ -70,10 +71,11 @@ spec:
             items:
             - key: redis-config
               path: redis.conf
-        {{ if eq .Values.useKubernetesSecret "false"}}
+        {{- $additionalVolumes := include "resc.redisAdditionalVolumes" . }}
+        {{- if $additionalVolumes }}
         {{- with include "resc.redisAdditionalVolumes" .}}
           {{- nindent 8 .}}
         {{- end }}
-        {{ end }}
+        {{- end }}
 
 

deployment/kubernetes/charts/resc-vcs-scanner-secrets/templates/vcs_scanner_secrets_deployment.yaml

@@ -57,11 +57,12 @@ spec:
             - name: config-volume
               mountPath: {{ .Values.config.vcs_instance_file_path }}
               subPath: vcs_instances_config.json
-          {{ if eq .Values.useKubernetesSecret "false"}}
+          {{- $additionalVolumeMounts := include "resc.vcsScannerSecretsAdditionalVolumeMounts" . }}
+          {{- if $additionalVolumeMounts }}
           {{- with include "resc.vcsScannerSecretsAdditionalVolumeMounts" .}}
             {{- nindent 12 .}}
           {{- end }}
-          {{ end }}
+          {{- end }}
         env:
           - name: GET_HOSTS_FROM
             value: dns
@@ -80,11 +81,12 @@ spec:
         - name: config-volume
           configMap:
             name: {{ .Values.global.appName }}-vcs-instances-config
-        {{ if eq .Values.useKubernetesSecret "false"}}
+        {{- $additionalVolumes := include "resc.vcsScannerSecretsAdditionalVolumes" . }}
+        {{- if $additionalVolumes }}
         {{- with include "resc.vcsScannerSecretsAdditionalVolumes" .}}
           {{- nindent 8 .}}
         {{- end }}
-        {{ end }}
+        {{- end }}
       restartPolicy: {{ .Values.restartPolicy }}
       {{ if .Values.global.imagePullSecret }}
       imagePullSecrets:

deployment/kubernetes/charts/resc-vcs-scraper-projects/templates/vcs_scraper_projects_cron_job.yaml

@@ -58,11 +58,12 @@ spec:
               - name: config-volume
                 mountPath: {{ .Values.config.vcs_instance_file_path }}
                 subPath: vcs_instances_config.json
-              {{ if eq .Values.useKubernetesSecret "false"}}
+              {{- $additionalVolumeMounts := include "resc.vcsScraperProjectsAdditionalVolumeMounts" . }}
+              {{- if $additionalVolumeMounts }}
               {{- with include "resc.vcsScraperProjectsAdditionalVolumeMounts" .}}
                 {{- nindent 14 .}}
               {{- end }}
-              {{ end }}
+              {{- end }}
             env:
               - name: GET_HOSTS_FROM
                 value: dns
@@ -81,11 +82,12 @@ spec:
             - name: config-volume
               configMap:
                 name: {{ .Values.global.appName }}-vcs-instances-config
-            {{ if eq .Values.useKubernetesSecret "false"}}
+            {{- $additionalVolumes := include "resc.vcsScraperProjectsAdditionalVolumes" . }}
+            {{- if $additionalVolumes }}
             {{- with include "resc.vcsScraperProjectsAdditionalVolumes" .}}
               {{- nindent 12 .}}
             {{- end }}
-            {{ end }}
+            {{- end }}
           restartPolicy: {{ .Values.restartPolicy }}
           {{ if .Values.global.imagePullSecret }}
           imagePullSecrets:

deployment/kubernetes/charts/resc-vcs-scraper-repositories/templates/vcs_scraper_repositories_deployment.yaml

@@ -59,11 +59,12 @@ spec:
           - name: config-volume
             mountPath: {{ .Values.config.vcs_instance_file_path }}
             subPath: vcs_instances_config.json
-          {{ if eq .Values.useKubernetesSecret "false"}}
+          {{- $additionalVolumeMounts := include "resc.vcsScraperRepositoriesAdditionalVolumeMounts" . }}
+          {{- if $additionalVolumeMounts }}
           {{- with include "resc.vcsScraperRepositoriesAdditionalVolumeMounts" .}}
             {{- nindent 10 .}}
           {{- end }}
-          {{ end }}
+          {{- end }}
         env:
           - name: GET_HOSTS_FROM
             value: dns
@@ -86,11 +87,12 @@ spec:
         - name: config-volume
           configMap:
             name: {{ .Values.global.appName }}-vcs-instances-config
-        {{ if eq .Values.useKubernetesSecret "false"}}
+        {{- $additionalVolumes := include "resc.vcsScraperRepositoriesAdditionalVolumes" . }}
+        {{- if $additionalVolumes }}
         {{- with include "resc.vcsScraperRepositoriesAdditionalVolumes" .}}
           {{- nindent 8 .}}
         {{- end }}
-        {{ end }}
+        {{- end }}
       restartPolicy: {{ .Values.restartPolicy }}
       {{ if .Values.global.imagePullSecret }}
       imagePullSecrets:

deployment/kubernetes/templates/web_service_deployment.tpl

@@ -59,11 +59,12 @@ spec:
             - name: config-volume
               mountPath: /tmp/odbc.ini
               subPath: odbc.ini
-            {{ if eq .Values.useKubernetesSecret "false"}}
+            {{- $additionalVolumeMounts := include "resc.rescWebserviceAdditionalVolumeMounts" . }}
+            {{- if $additionalVolumeMounts }}
             {{- with include "resc.rescWebserviceAdditionalVolumeMounts" .}}
                 {{- nindent 12 .}}
             {{- end }}
-            {{ end }}
+            {{- end }}
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: false
@@ -87,11 +88,12 @@ spec:
         - name: config-volume
           configMap:
             name: {{ .Values.global.appName }}-web-service-config{{ .Values.nameSuffix }}
-        {{ if eq .Values.useKubernetesSecret "false"}}
+        {{- $additionalVolumes := include "resc.rescWebserviceAdditionalVolumes" . }}
+        {{- if $additionalVolumes }}
         {{- with include "resc.rescWebserviceAdditionalVolumes" .}}
           {{- nindent 8 .}}
         {{- end }}
-        {{ end }}
+        {{- end }}
       {{ if .Values.global.imagePullSecret }}
       imagePullSecrets:
       - name: {{ .Values.global.imagePullSecret }}