Support adding arbitrary env variables to each application container

tylervz · tylervz · commit bdd722c743d4 · 2025-08-20T14:19:22.000-04:00
diff --git a/charts/thub/Chart.yaml b/charts/thub/Chart.yaml
@@ -6,7 +6,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.8.9
+version: 1.9.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
@@ -17,17 +17,17 @@ home: https://hypercision.github.io/helm-charts
 
 dependencies:
   - name: assigned-item-service
-    version: 1.4.0
+    version: 1.5.0
   - name: item-service
-    version: 1.3.2
+    version: 1.4.0
   - name: keycloak-config
     version: 0.1.1
   - name: lms-data-service
-    version: 1.6.1
+    version: 1.7.0
   - name: ojt
-    version: 1.5.6
+    version: 1.6.0
   - name: user-service
-    version: 1.3.5
+    version: 1.4.0
 
 sources:
   - https://github.com/hypercision/masterdata-services
diff --git a/charts/thub/charts/assigned-item-service/Chart.yaml b/charts/thub/charts/assigned-item-service/Chart.yaml
@@ -7,7 +7,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.4.0
+version: 1.5.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/thub/charts/assigned-item-service/templates/_helpers.tpl b/charts/thub/charts/assigned-item-service/templates/_helpers.tpl
@@ -61,6 +61,13 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
+{{/*
+Create the name of the Assigned Item Service application settings configmap
+*/}}
+{{- define "assigned-item-service.assignedItemServiceConfigmapName" -}}
+{{ include "assigned-item-service.name" . }}-application-config
+{{- end }}
+
 {{/*
 Create the name of the Grails datasource configmap
 */}}
diff --git a/charts/thub/charts/assigned-item-service/templates/assigned-item-service-configmap.yaml b/charts/thub/charts/assigned-item-service/templates/assigned-item-service-configmap.yaml
@@ -0,0 +1,17 @@
+# This will have different values for each client/namespace
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "assigned-item-service.assignedItemServiceConfigmapName" . }}
+  labels:
+    {{- include "assigned-item-service.labels" . | nindent 4 }}
+  annotations:
+    description: >
+      Contains configuration settings specifically for the Assigned Item Service Grails application,
+      which will be supplied to the Assigned Item Service Grails application as environment variables.
+data:
+  {{- if .Values.additionalConfig }}
+  {{- range $key, $value := .Values.additionalConfig }}
+  {{ $key }}: {{ $value | quote }}
+  {{- end }}
+  {{- end }}
diff --git a/charts/thub/charts/assigned-item-service/templates/deployment.yaml b/charts/thub/charts/assigned-item-service/templates/deployment.yaml
@@ -61,6 +61,8 @@ spec:
               name: {{ .Values.global.activemqBrokerConfigMapName }}
           - configMapRef:
               name: {{ .Values.global.sharedSettingsConfigMapName }}
+          - configMapRef:
+              name: {{ include "assigned-item-service.assignedItemServiceConfigmapName" . }}
           volumeMounts:
           - name: application-config
             mountPath: /home/app/config
diff --git a/charts/thub/charts/assigned-item-service/values.yaml b/charts/thub/charts/assigned-item-service/values.yaml
@@ -71,6 +71,10 @@ readinessProbe: |
 service:
   type: ClusterIP
 
+# Any additional environment variables to be set in the Assigned Item Service container.
+# For example, custom.property.one: "value1"
+additionalConfig: {}
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
diff --git a/charts/thub/charts/item-service/Chart.yaml b/charts/thub/charts/item-service/Chart.yaml
@@ -7,7 +7,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.3.2
+version: 1.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/thub/charts/item-service/templates/_helpers.tpl b/charts/thub/charts/item-service/templates/_helpers.tpl
@@ -61,6 +61,13 @@ Create the name of the service account to use
 {{- end }}
 {{- end }}
 
+{{/*
+Create the name of the Item Service application settings configmap
+*/}}
+{{- define "item-service.itemServiceConfigmapName" -}}
+{{ include "item-service.name" . }}-application-config
+{{- end }}
+
 {{/*
 Create the name of the Grails datasource configmap
 */}}
diff --git a/charts/thub/charts/item-service/templates/deployment.yaml b/charts/thub/charts/item-service/templates/deployment.yaml
@@ -57,6 +57,8 @@ spec:
               name: {{ .Values.global.activemqBrokerConfigMapName }}
           - configMapRef:
               name: {{ .Values.global.sharedSettingsConfigMapName }}
+          - configMapRef:
+              name: {{ include "item-service.itemServiceConfigmapName" . }}
           volumeMounts:
           - name: application-config
             mountPath: /home/app/config
diff --git a/charts/thub/charts/item-service/templates/item-service-configmap.yaml b/charts/thub/charts/item-service/templates/item-service-configmap.yaml
@@ -0,0 +1,17 @@
+# This will have different values for each client/namespace
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "item-service.itemServiceConfigmapName" . }}
+  labels:
+    {{- include "item-service.labels" . | nindent 4 }}
+  annotations:
+    description: >
+      Contains configuration settings specifically for the Item Service Grails application,
+      which will be supplied to the Item Service Grails application as environment variables.
+data:
+  {{- if .Values.additionalConfig }}
+  {{- range $key, $value := .Values.additionalConfig }}
+  {{ $key }}: {{ $value | quote }}
+  {{- end }}
+  {{- end }}
diff --git a/charts/thub/charts/item-service/values.yaml b/charts/thub/charts/item-service/values.yaml
@@ -71,6 +71,10 @@ readinessProbe: |
 service:
   type: ClusterIP
 
+# Any additional environment variables to be set in the Item Service container.
+# For example, custom.property.one: "value1"
+additionalConfig: {}
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
diff --git a/charts/thub/charts/lms-data-service/Chart.yaml b/charts/thub/charts/lms-data-service/Chart.yaml
@@ -7,7 +7,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.6.1
+version: 1.7.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/thub/charts/lms-data-service/templates/_helpers.tpl b/charts/thub/charts/lms-data-service/templates/_helpers.tpl
@@ -75,6 +75,13 @@ Create the name of the encryption configmap
 {{ include "lms-data-service.name" . }}-encryption-config
 {{- end }}
 
+{{/*
+Create the name of the LMS Data Service configmap
+*/}}
+{{- define "lms-data-service.lmsDataServiceConfigmapName" -}}
+{{ include "lms-data-service.name" . }}-application-config
+{{- end }}
+
 {{/*
 Create the name of the SFTP configmap
 */}}
diff --git a/charts/thub/charts/lms-data-service/templates/deployment.yaml b/charts/thub/charts/lms-data-service/templates/deployment.yaml
@@ -89,6 +89,8 @@ spec:
           - configMapRef:
               name: {{ include "lms-data-service.workdayConfigmapName" . }}
           {{- end }}
+          - configMapRef:
+              name: {{ include "lms-data-service.lmsDataServiceConfigmapName" . }}
           # The keycloak ConfigMaps are defined in the keycloak-config chart
           - configMapRef:
               name: keycloak-shared-config
diff --git a/charts/thub/charts/lms-data-service/templates/lms-data-service-configmap.yaml b/charts/thub/charts/lms-data-service/templates/lms-data-service-configmap.yaml
@@ -0,0 +1,17 @@
+# This will have different values for each client/namespace
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "lms-data-service.lmsDataServiceConfigmapName" . }}
+  labels:
+    {{- include "lms-data-service.labels" . | nindent 4 }}
+  annotations:
+    description: >
+      Contains configuration settings specifically for the LMS Data Service Grails application,
+      which will be supplied to the LMS Data Service Grails application as environment variables.
+data:
+  {{- if .Values.additionalConfig }}
+  {{- range $key, $value := .Values.additionalConfig }}
+  {{ $key }}: {{ $value | quote }}
+  {{- end }}
+  {{- end }}
diff --git a/charts/thub/charts/lms-data-service/values.yaml b/charts/thub/charts/lms-data-service/values.yaml
@@ -108,6 +108,10 @@ tolerations: []
 
 affinity: {}
 
+# Any additional environment variables to be set in the LMS Data Service container.
+# For example, custom.property.one: "value1"
+additionalConfig: {}
+
 # Encryption key for storing sensitive values in the database
 encryptionPassword: ""
 
diff --git a/charts/thub/charts/ojt/Chart.yaml b/charts/thub/charts/ojt/Chart.yaml
@@ -7,7 +7,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.5.6
+version: 1.6.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/thub/charts/ojt/templates/ojt-configmap.yaml b/charts/thub/charts/ojt/templates/ojt-configmap.yaml
@@ -10,6 +10,11 @@ metadata:
       Contains configuration settings specifically for the OJT Grails application,
       which will be supplied to the OJT Grails application as environment variables.
 data:
+  {{- if .Values.additionalConfig }}
+  {{- range $key, $value := .Values.additionalConfig }}
+  {{ $key }}: {{ $value | quote }}
+  {{- end }}
+  {{- end }}
   {{- if .Values.mail.password }}
   grails.mail.password: {{ .Values.mail.password | quote }}
   {{- end }}
diff --git a/charts/thub/charts/ojt/values.yaml b/charts/thub/charts/ojt/values.yaml
@@ -113,6 +113,10 @@ mail:
   # "App password" for OJT application to send email from the ojt@hc-labs.com account
   password: ""
 
+# Any additional environment variables to be set in the OJT container.
+# For example, custom.property.one: "value1"
+additionalConfig: {}
+
 learningHistorySchedulerJob:
   enabled: true
   # Run every 30 minutes
diff --git a/charts/thub/charts/user-service/Chart.yaml b/charts/thub/charts/user-service/Chart.yaml
@@ -7,7 +7,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.3.5
+version: 1.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/thub/charts/user-service/templates/user-service-configmap.yaml b/charts/thub/charts/user-service/templates/user-service-configmap.yaml
@@ -10,6 +10,11 @@ metadata:
       Contains configuration settings specifically for the User Service Grails application,
       which will be supplied to the User Service Grails application as environment variables.
 data:
+  {{- if .Values.additionalConfig }}
+  {{- range $key, $value := .Values.additionalConfig }}
+  {{ $key }}: {{ $value | quote }}
+  {{- end }}
+  {{- end }}
   {{- if .Values.mail.password }}
   grails.mail.password: {{ .Values.mail.password | quote }}
   {{- end }}
diff --git a/charts/thub/charts/user-service/values.yaml b/charts/thub/charts/user-service/values.yaml
@@ -71,6 +71,10 @@ readinessProbe: |
 service:
   type: ClusterIP
 
+# Any additional environment variables to be set in the User Service container.
+# For example, custom.property.one: "value1"
+additionalConfig: {}
+
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
diff --git a/charts/thub/values.yaml b/charts/thub/values.yaml
@@ -112,6 +112,9 @@ assigned-item-service:
       port: http
     initialDelaySeconds: 40
     timeoutSeconds: 3
+  # Any additional environment variables to be set in the assigned-item-service container.
+  # For example, custom.property.one: "value1"
+  additionalConfig: {}
   resubmitOjtsSchedulerJob:
     enabled: true
     # Run on the fourth minute of every 6th hour
@@ -146,6 +149,9 @@ item-service:
       port: http
     initialDelaySeconds: 30
     timeoutSeconds: 3
+  # Any additional environment variables to be set in the Item Service container.
+  # For example, custom.property.one: "value1"
+  additionalConfig: {}
 
 lms-data-service:
   resources: {}
@@ -176,6 +182,9 @@ lms-data-service:
       port: http
     initialDelaySeconds: 30
     timeoutSeconds: 3
+  # Any additional environment variables to be set in the LMS Data Service container.
+  # For example, custom.property.one: "value1"
+  additionalConfig: {}
   # Encryption key for storing sensitive values in the database
   encryptionPassword: ""
   # Connection info for the SFTP that the LMS interacts with
@@ -256,6 +265,9 @@ ojt:
       port: http
     initialDelaySeconds: 40
     timeoutSeconds: 3
+  # Any additional environment variables to be set in the OJT container.
+  # For example, custom.property.one: "value1"
+  additionalConfig: {}
   mail:
     # "App password" for OJT application to send email from the ojt@hc-labs.com account
     password: ""
@@ -293,6 +305,9 @@ user-service:
       port: http
     initialDelaySeconds: 40
     timeoutSeconds: 3
+  # Any additional environment variables to be set in the User Service container.
+  # For example, custom.property.one: "value1"
+  additionalConfig: {}
   mail:
     # "App password" for User Service application to send email from the ojt@hc-labs.com account
     password: ""
