Add configmap for User Service mail config

Author: tylervz

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.7.4
+version: 1.7.5
 
 # 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
@@ -27,7 +27,7 @@ dependencies:
   - name: ojt
     version: 1.4.13
   - name: user-service
-    version: 1.3.2
+    version: 1.3.3
 
 sources:
   - https://github.com/hypercision/masterdata-services

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.2
+version: 1.3.3
 
 # 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

charts/thub/charts/user-service/templates/_helpers.tpl

@@ -67,3 +67,10 @@ Create the name of the Grails datasource configmap
 {{- define "user-service.datasourceConfigmapName" -}}
 {{ include "user-service.name" . }}-datasource-config
 {{- end }}
+
+{{/*
+Create the name of the User Service application settings configmap
+*/}}
+{{- define "user-service.userServiceConfigmapName" -}}
+{{ include "user-service.name" . }}-user-service-settings-config
+{{- end }}

charts/thub/charts/user-service/templates/deployment.yaml

@@ -73,6 +73,8 @@ spec:
               name: {{ .Values.global.activemqBrokerConfigMapName }}
           - configMapRef:
               name: {{ .Values.global.sharedSettingsConfigMapName }}
+          - configMapRef:
+              name: {{ include "user-service.userServiceConfigmapName" . }}
           # The keycloak ConfigMaps are defined in the keycloak-config chart
           - configMapRef:
               name: keycloak-shared-config

charts/thub/charts/user-service/templates/user-service-configmap.yaml

@@ -0,0 +1,15 @@
+# This will have different values for each client/namespace
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "user-service.userServiceConfigmapName" . }}
+  labels:
+    {{- include "user-service.labels" . | nindent 4 }}
+  annotations:
+    description: >
+      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.mail.password }}
+  grails.mail.password: {{ .Values.mail.password | quote }}
+  {{- end }}

charts/thub/charts/user-service/values.yaml

@@ -107,3 +107,7 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+mail:
+    # "App password" for User Service application to send email from the ojt@hc-labs.com account
+    password: ""

charts/thub/values.yaml

@@ -283,6 +283,9 @@ user-service:
       port: http
     initialDelaySeconds: 40
     timeoutSeconds: 3
+  mail:
+    # "App password" for User Service application to send email from the ojt@hc-labs.com account
+    password: ""
 
 keycloak-config:
   # Whether or not to create the realm ConfigMap