[G2P-3424] Several Helm templating bugs fixed. Chart installs without errors on Cluster.

Author: pjoshi751

charts/openg2p-pbms-bg-task-api/templates/virtualservice.yaml

@@ -10,14 +10,14 @@ metadata:
   {{- end }}
 spec:
   hosts:
-  - {{ default .Values.global.g2pPbmsBgTaskHostname .Values.istio.virtualservice.host | quote }}
+  - {{ default ( include "common.tplvalues.render" (dict "value" .Values.global.g2pPbmsBgTaskHostname "context" $ )) .Values.istio.virtualservice.host | quote }}
   gateways:
   - {{ default (include "common.names.fullname" .) .Values.istio.virtualservice.gateway }}
   http:
   - headers:
       request:
         set:
-          x-forwarded-host: {{ default .Values.global.g2pPbmsBgTaskHostname .Values.istio.virtualservice.host | quote }}
+          x-forwarded-host: {{ default (include "common.tplvalues.render" (dict "value" .Values.global.g2pPbmsBgTaskHostname "context" $)) .Values.global.g2pPbmsBgTaskHostname .Values.istio.virtualservice.host | quote }}
           x-forwarded-proto: https
     match:
     - uri:

charts/openg2p-pbms-bg-task-api/values.yaml

@@ -10,9 +10,9 @@ global:
   registryDBUserPasswordKey: 'registry_db_user'
   postgresqlHost: openg2p-commons-postgresql
   pbmsBgTaskDB: '{{ .Release.Name }}_bgtask_db'
-  pbmsBgTaskDBUser: '{{ .Release.Name}}_bgtask_db_user'
+  pbmsBgTaskDBUser: '{{ .Release.Name }}_bgtask_db_user'
   pbmsBgTaskDBSecret: '{{ .Release.Name }}_bgtask'
-  pbmsBgTaskDBUserPasswordKey: '{{ .Release.Name}}_bgtask_db_user'
+  pbmsBgTaskDBUserPasswordKey: '{{ .Release.Name }}_bgtask_db_user'
 
 ## Pod extra labels
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/

charts/openg2p-pbms-bg-task-celery-beat-producers/values.yaml

@@ -10,14 +10,14 @@ global:
   registryDBUserPasswordKey: 'registry_db_user'
 
   pbmsDB: '{{ .Release.Name }}_db'
-  pbmsDBUser: '{{ .Release.Name}}_db_user'
+  pbmsDBUser: '{{ .Release.Name }}_db_user'
   pbmsDBSecret: '{{ .Release.Name }}'
-  pbmsDBUserPasswordKey: '{{ .Release.Name}}_db_user'
+  pbmsDBUserPasswordKey: '{{ .Release.Name }}_db_user'
 
   pbmsBgTaskDB: '{{ .Release.Name }}_bgtask_db'
-  pbmsBgTaskDBUser: '{{ .Release.Name}}_bgtask_db_user'
+  pbmsBgTaskDBUser: '{{ .Release.Name }}_bgtask_db_user'
   pbmsBgTaskDBSecret: '{{ .Release.Name }}_bgtask'
-  pbmsBgTaskDBUserPasswordKey: '{{ .Release.Name}}_bgtask_db_user'
+  pbmsBgTaskDBUserPasswordKey: '{{ .Release.Name }}_bgtask_db_user'
 
   # Default name of Redis that is installed with the parent openg2p-pbms chart
   redisInstallationName: '{{ .Release.Name }}-redis-master'
@@ -201,8 +201,7 @@ envVarsFrom:
   BG_TASK_CELERY_BEAT_DB_PASSWORD_PBMS :
     secretKeyRef:
       name: '{{ tpl .Values.global.pbmsDBSecret $ }}'
-      #key: '{{ tpl .Values.global.pbmsDBuserPasswordKey $ }}'
-      key: '{{ .Values.global.pbmsDBuserPasswordKey }}'
+      key: '{{ tpl .Values.global.pbmsDBUserPasswordKey $ }}'
 
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##

charts/openg2p-pbms-bg-task-celery-workers/values.yaml

@@ -10,14 +10,14 @@ global:
   registryDBUserPasswordKey: 'registry_db_user'
 
   pbmsDB: '{{ .Release.Name }}_db'
-  pbmsDBUser: '{{ .Release.Name}}_db_user'
+  pbmsDBUser: '{{ .Release.Name }}_db_user'
   pbmsDBSecret: '{{ .Release.Name }}'
-  pbmsDBUserPasswordKey: '{{ .Release.Name}}_db_user'
+  pbmsDBUserPasswordKey: '{{ .Release.Name }}_db_user'
 
   pbmsBgTaskDB: '{{ .Release.Name }}_bgtask_db'
-  pbmsBgTaskDBUser: '{{ .Release.Name}}_bgtask_db_user'
-  pbmsBgTaskDBSecret: '{{ .Release.Name }}_bgtask'
-  pbmsBgTaskDBUserPasswordKey: '{{ .Release.Name}}_bgtask_db_user'
+  pbmsBgTaskDBUser: '{{ .Release.Name }}_bgtask_db_user'
+  pbmsBgTaskDBSecret: '{{ .Release.Name }}-bgtask'
+  pbmsBgTaskDBUserPasswordKey: '{{ .Release.Name }}_bgtask_db_user'
 
   # Default name of Redis that is installed with the parent openg2p-pbms chart
   redisInstallationName: '{{ .Release.Name }}-redis-master'
@@ -220,8 +220,7 @@ envVarsFrom:
   BG_TASK_CELERY_WORKERS_DB_PASSWORD_PBMS:
     secretKeyRef:
       name: '{{ tpl .Values.global.pbmsDBSecret $ }}'
-      #key: '{{ tpl .Values.global.pbmsDBuserPasswordKey $ }}'
-      key: '{{ .Values.global.pbmsDBuserPasswordKey  }}'
+      key: '{{ tpl .Values.global.pbmsDBUserPasswordKey $ }}'
 
 ## ref: http://kubernetes.io/docs/user-guide/compute-resources/
 ##

charts/openg2p-pbms/.gitignore

@@ -1,3 +1,4 @@
 Chart.lock
 *.tgz
 charts/odoo
+charts/postgres-init

charts/openg2p-pbms/values.yaml

@@ -5,14 +5,15 @@ global:
   postgresqlHost: openg2p-commons-postgresql
 
   pbmsDB: '{{ .Release.Name }}_db'
-  pbmsDBUser: '{{ .Release.Name}}_db_user'
+  pbmsDBUser: '{{ .Release.Name }}_db_user'
   pbmsDBSecret: '{{ .Release.Name }}'
-  pbmsDBUserPasswordKey: '{{ .Release.Name}}_db_user'
+  pbmsDBUserPasswordKey: '{{ .Release.Name }}_db_user'
 
   pbmsBgTaskDB: '{{ .Release.Name }}_bgtask_db'
-  pbmsBgTaskDBUser: '{{ .Release.Name}}_bgtask_db_user'
-  pbmsBgTaskDBSecret: '{{ .Release.Name }}_bgtask'
-  pbmsBgTaskDBUserPasswordKey: '{{ .Release.Name}}_bgtask_db_user'
+  pbmsBgTaskDBUser: '{{ .Release.Name }}_bgtask_db_user'
+  # Note underscore doesn't work here for Kubernetes secret, hence hyphen in the name
+  pbmsBgTaskDBSecret: '{{ .Release.Name }}-bgtask'
+  pbmsBgTaskDBUserPasswordKey: '{{ .Release.Name }}_bgtask_db_user'
 
   # Defaults that should be overridden by questions.yaml
   registryDB: 'registry_db'
@@ -30,9 +31,9 @@ global:
   minioInstallationName: openg2p-commons-minio
 
   # TODO: Add this to questions.yaml
-  g2pPbmsBgTaskHostname: '{{ tpl .Release.Name $ }}-bg-task.devops.openg2p.org'
+  g2pPbmsBgTaskHostname: '{{ .Release.Name }}-bg-task.devops.openg2p.org'
 
-  g2pPbmsBgTaskClientId: 'openg2p-pbms-bg-task-{{ .Release.Namespace }}'
+  g2pPbmsBgTaskClientId: 'openg2p-pbms-bg-task-{{ tpl .Release.Namespace $ }}'
   g2pPbmsBgTaskClientSecret: ''
 
   keymanagerBaseUrl: https://keymanager.openg2p.org
@@ -65,7 +66,7 @@ postgres-init:
     # TODO: Read variables from globals instead of hardcoding below
     - name: '{{ .Release.Name }}_bgtask_db'
       user: '{{ .Release.Name}}_bgtask_db_user'
-      secret: '{{ .Release.Name }}_bgtask'
+      secret: '{{ .Release.Name }}-bgtask'
       secretUserPasswordKey: '{{ .Release.Name}}_bgtask_db_user'
 
 odoo: