feat(helm-charts): support extra volume and mounts, update secret

Author: aarthy-dk

deploy/charts/testgen-app/templates/_environment.yaml

@@ -2,12 +2,12 @@
 - name: TG_DECRYPT_SALT
   valueFrom:
     secretKeyRef:
-      name: {{ include "testgen.fullname" . }}
+      name: {{ .Values.testgen.databaseDecryptSecret.name | quote }}
       key: "decrypt-salt"
 - name: TG_DECRYPT_PASSWORD
   valueFrom:
     secretKeyRef:
-      name: {{ include "testgen.fullname" . }}
+      name: {{ .Values.testgen.databaseDecryptSecret.name | quote }}
       key: "decrypt-password"
 - name: TG_METADATA_DB_HOST
   value: {{ .Values.testgen.databaseHost | quote }}

deploy/charts/testgen-app/templates/deployment.yaml

@@ -44,6 +44,14 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
             {{- include "testgen.environment" . | nindent 12 }}
+          {{- with .Values.extraVolumeMounts }}
+          volumeMounts:
+            {{ toYaml . | nindent 12 }}
+          {{- end }}
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{ toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

deploy/charts/testgen-app/templates/secrets.yaml

@@ -1,8 +1,8 @@
-{{- if .Values.secrets.create -}}
+{{- if .Values.testgen.databaseDecryptSecret.create -}}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "testgen.fullname" . }}
+  name: {{ .Values.testgen.databaseDecryptSecret.name | quote }}
   labels:
     {{- include "testgen.labels" . | nindent 4 }}
   annotations:

deploy/charts/testgen-app/templates/service.yaml

@@ -11,5 +11,10 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+      {{- if eq .Values.service.type "NodePort" }}
+      {{- with .Values.service.nodePort }}
+      nodePort: {{ . }}
+      {{- end }}
+      {{- end }}
   selector:
     {{- include "testgen.selectorLabels" . | nindent 4 }}

deploy/charts/testgen-app/values.yaml

@@ -1,13 +1,16 @@
 # Default values for testgen.
 
 testgen:
-  databaseHost: "testgen-services-postgresql"
+  databaseHost: "postgresql"
   databaseName: "datakitchen"
   databaseSchema: "tgapp"
   databaseUser: "postgres"
   databasePasswordSecret:
     name: "testgen-services-postgresql"
     key: "postgres-password"
+  databaseDecryptSecret:
+    create: true
+    name: testgen-database-decrypt
   uiUser: "admin"
   uiPassword:
   trustTargetDatabaseCertificate: false
@@ -29,9 +32,6 @@ image:
   pullPolicy: IfNotPresent
   tag: "v3"
 
-secrets:
-  create: true
-
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
@@ -62,8 +62,9 @@ securityContext: {}
   # runAsUser: 1000
 
 service:
-  type: ClusterIP
+  type: NodePort
   port: 8501
+  nodePort: 8501
 
 resources: {}
   # limits:

deploy/charts/testgen-services/values.yaml

@@ -3,5 +3,6 @@
 # Declare variables to be passed into your templates.
 
 postgresql:
+  fullnameOverride: postgresql
   auth:
     database: "datakitchen"