Merge pull request #145 from abnamro/2526293-bug-fix-redis-and-vault

[#2526293] Fixed local deployment issue related to Redis cache and key vault

Author: amrityamrout

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

@@ -47,9 +47,11 @@ spec:
                 name: {{ .Values.global.appName }}-rabbitmq-admin-secret
             {{ end }}
           volumeMounts:
+            {{ if eq .Values.useKubernetesSecret "false"}}
             {{- with include "resc.mqInitAdditionalVolumeMounts" .}}
               {{- nindent 12 .}}
             {{- end }}
+            {{ end }}
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: false
@@ -62,9 +64,11 @@ spec:
             runAsNonRoot: true
             runAsUser: 10001
       volumes:
+        {{ if eq .Values.useKubernetesSecret "false"}}
         {{- with include "resc.mqInitAdditionalVolumes" .}}
           {{- nindent 8 .}}
         {{- end }}
+        {{ end }}
       restartPolicy: {{ .Values.mqInit.restartPolicy }}
       {{ if .Values.global.imagePullSecret }}
       imagePullSecrets:

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

@@ -41,9 +41,11 @@ spec:
         - name: {{ .Values.global.appName }}-mq-pv-storage
           persistentVolumeClaim:
             claimName: {{ .Values.global.appName }}-mq-pv-volume-claim
+        {{ if eq .Values.useKubernetesSecret "false"}}
         {{- with include "resc.mqAdditionalVolumes" .}}
           {{- nindent 8 .}}
         {{- end }}
+        {{ end }}
       containers:
         - name: {{ .Values.global.appName }}-mq
           image: {{ .Values.rabbitMQ.image.repository }}{{ .Values.rabbitMQ.image.name }}:{{ .Values.rabbitMQ.image.tag }}
@@ -76,9 +78,11 @@ spec:
             - mountPath: "/var/lib/rabbitmq/mnesia"
               subPath: "var/lib/rabbitmq/mnesia"
               name: {{ .Values.global.appName }}-mq-pv-storage
+            {{ if eq .Values.useKubernetesSecret "false"}}
             {{- with include "resc.mqAdditionalVolumeMounts" .}}
               {{- nindent 12 .}}
             {{- end }}
+            {{ end }}
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: false

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

@@ -37,12 +37,10 @@ spec:
         env:
           - name: MASTER
             value: "true"
-          {{ if eq .Values.useKubernetesSecret "true"}}
-          - name: REDIS_PASSWORD
-            valueFrom:
-              secretKeyRef:
-                name: {{ .Values.global.appName }}-redis-secret
-                key: REDIS_PASSWORD
+        envFrom:
+          {{ if eq .Values.useKubernetesSecret "true" }}
+          - secretRef:
+              name: {{ .Values.global.appName }}-redis-secret
           {{ end }}
         ports:
         - containerPort: {{ .Values.redis.config.port}}
@@ -55,9 +53,11 @@ spec:
           name: data
         - mountPath: /redis-master
           name: config
+        {{ if eq .Values.useKubernetesSecret "false"}}
         {{- with include "resc.redisAdditionalVolumeMounts" .}}
           {{- nindent 8 .}}
         {{- end }}
+        {{ end }}
       volumes:
         - name: data
           emptyDir: {}
@@ -67,8 +67,10 @@ spec:
             items:
             - key: redis-config
               path: redis.conf
+        {{ if eq .Values.useKubernetesSecret "false"}}
         {{- with include "resc.redisAdditionalVolumes" .}}
           {{- nindent 8 .}}
         {{- end }}
+        {{ end }}
 
 

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

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

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

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

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

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

deployment/kubernetes/charts/resc-web-service-no-auth/values.yaml

@@ -27,6 +27,7 @@ resc:
     dbPass: 
     odbcDriver: "ODBC Driver 18 for SQL Server"
     dbDSN: "rescdb"
+    redisPass:
   authRequired: "false"
   ssoConfig:
     ssoAccessTokenIssuerUrl: "notApplicable"

deployment/kubernetes/charts/resc-web-service/templates/web_service_secret.yaml

@@ -11,4 +11,7 @@ data:
   {{ end }}
   {{ if and (eq .Values.useKubernetesSecret "true") (.Values.resc.config.dbPass) }}
   MSSQL_PASSWORD: "{{ .Values.resc.config.dbPass | b64enc }}"
+  {{ end }}
+  {{ if and (eq .Values.useKubernetesSecret "true") (.Values.resc.config.redisPass) }}
+  REDIS_PASSWORD: "{{ .Values.resc.config.redisPass | b64enc }}"
   {{ end }}

deployment/kubernetes/charts/resc-web-service/values.yaml

@@ -28,6 +28,7 @@ resc:
     dbPass: 
     odbcDriver: "ODBC Driver 18 for SQL Server"
     dbDSN: "rescdb"
+    redisPass:
   authRequired: "true"
   ssoConfig:
     ssoAccessTokenIssuerUrl: ""

deployment/kubernetes/example-values.yaml

@@ -65,6 +65,7 @@ resc-web-service:
       dbSchema: "master" # <enter database schema name here, default to master>
       dbUser: "sa" # <enter database username here, default to sa>
       dbPass: "Y0urStr0ngPassword" # <enter database password here, default to Y0urStr0ngPassword>
+      redisPass: "Y0urStr0ngPassword" # <enter Redis password here for caching, default to Y0urStr0ngPassword>
     # To configure single sign on provide below values for ssoConfig attributes
     # These attributes will be used in the RESC API to validate access token
     ssoConfig:
@@ -85,6 +86,7 @@ resc-web-service-no-auth:
       dbSchema: "master" # <enter database schema name here, default to master>
       dbUser: "sa" # <enter database username here, default to sa>
       dbPass: "Y0urStr0ngPassword" # <enter database password here, default to Y0urStr0ngPassword>
+      redisPass: "Y0urStr0ngPassword" # <enter Redis password here for caching, default to Y0urStr0ngPassword>
 
 resc-database:
   hostOS: "windows" # possible values windows/linux
@@ -119,7 +121,7 @@ resc-redis:
     exposeToHostPort: 32379
     config:
       port: 6379
-      password: "Y0urStr0ngPassword"
+      password: "Y0urStr0ngPassword" # <enter Redis password here for caching, default to Y0urStr0ngPassword>
     resources:
       limits:
         cpu: 250m

deployment/kubernetes/templates/web_service_deployment.tpl

@@ -48,13 +48,6 @@ spec:
           env:
             - name: GET_HOSTS_FROM
               value: dns
-            {{ if eq .Values.useKubernetesSecret "true"}}
-            - name: REDIS_PASSWORD
-              valueFrom:
-                secretKeyRef:
-                  name: {{ .Values.global.appName }}-redis-secret
-                  key: REDIS_PASSWORD
-          {{ end }}
           envFrom:
             - configMapRef:
                 name: {{ .Values.global.appName }}-web-service-config{{ .Values.nameSuffix }}
@@ -66,9 +59,11 @@ spec:
             - name: config-volume
               mountPath: /tmp/odbc.ini
               subPath: odbc.ini
+            {{ if eq .Values.useKubernetesSecret "false"}}
             {{- with include "resc.rescWebserviceAdditionalVolumeMounts" .}}
                 {{- nindent 12 .}}
             {{- end }}
+            {{ end }}
           securityContext:
             allowPrivilegeEscalation: false
             readOnlyRootFilesystem: false
@@ -92,9 +87,11 @@ spec:
         - name: config-volume
           configMap:
             name: {{ .Values.global.appName }}-web-service-config{{ .Values.nameSuffix }}
+        {{ if eq .Values.useKubernetesSecret "false"}}
         {{- with include "resc.rescWebserviceAdditionalVolumes" .}}
           {{- nindent 8 .}}
         {{- end }}
+        {{ end }}
       {{ if .Values.global.imagePullSecret }}
       imagePullSecrets:
       - name: {{ .Values.global.imagePullSecret }}

deployment/resc-helm-wizard/src/resc_helm_wizard/config/example-values.yaml

@@ -65,6 +65,7 @@ resc-web-service:
       dbSchema: "master" # <enter database schema name here, default to master>
       dbUser: "sa" # <enter database username here, default to sa>
       dbPass: "Y0urStr0ngPassword" # <enter database password here, default to Y0urStr0ngPassword>
+      redisPass: "Y0urStr0ngPassword" # <enter Redis password here for caching, default to Y0urStr0ngPassword>
     # To configure single sign on provide below values for ssoConfig attributes
     # These attributes will be used in the RESC API to validate access token
     ssoConfig:
@@ -85,6 +86,7 @@ resc-web-service-no-auth:
       dbSchema: "master" # <enter database schema name here, default to master>
       dbUser: "sa" # <enter database username here, default to sa>
       dbPass: "Y0urStr0ngPassword" # <enter database password here, default to Y0urStr0ngPassword>
+      redisPass: "Y0urStr0ngPassword" # <enter Redis password here for caching, default to Y0urStr0ngPassword>
 
 resc-database:
   hostOS: "windows" # possible values windows/linux
@@ -119,7 +121,7 @@ resc-redis:
     exposeToHostPort: 32379
     config:
       port: 6379
-      password: "Y0urStr0ngPassword"
+      password: "Y0urStr0ngPassword" # <enter Redis password here for caching, default to Y0urStr0ngPassword>
     resources:
       limits:
         cpu: 250m