WIP: add values for OJT builds with SSO redirects

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.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
@@ -23,9 +23,9 @@ dependencies:
   - 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
 

charts/thub/charts/keycloak-config/templates/keycloak-configmap.yaml

@@ -33,4 +33,6 @@ data:
   grails.plugin.springsecurity.rest.keycloak.key: {{ .Values.clientId | quote }}
   # Username for an admin of this realm. Password is defined in keycloak-realm-secret
   grails.plugin.springsecurity.rest.keycloak.realmAdminUsername: {{ required "realmAdminUsername cannot be emtpy" .Values.realmAdminUsername | quote }}
+  # The desired scopes when requesting an access token. This is a space seperated list.
+  grails.plugin.springsecurity.rest.keycloak.scopes: {{ .Values.scopes | quote }}
 {{- end }}

charts/thub/charts/keycloak-config/values.yaml

@@ -15,6 +15,8 @@ databasePassword: ""
 realmName: ""
 clientId: "ojt"
 clientSecret: ""
+# The desired scopes when requesting an access token. This is a space seperated list.
+scopes: "email profile"
 # Credentials for the admin of the Keycloak server (master realm)
 masterAdminUsername: ""
 masterAdminPassword: ""

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

charts/thub/charts/lms-data-service/lms-data-service-configmap.yaml

@@ -0,0 +1,13 @@
+# 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:
+  hclabs.lmsDataService.loginUsingSso: {{ .Values.loginUsingSso | quote }}

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
 */}}

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

charts/thub/charts/lms-data-service/values.yaml

@@ -134,6 +134,10 @@ workday:
   # Specify API version here to override the default defined by the LMS Data Service application.yml
   apiVersion: ""
 
+# Boolean that when true, users will login to LMS Data Service using a SSO authentication provider
+# with a redirect URL rather than entering their their credentials on the LMS Data Service web app login page.
+loginUsingSso: true
+
 assignedItemsSchedulerJob:
   enabled: true
   # Run on the 15th minute of every hour from 14 thru 23 and 5

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

charts/thub/charts/ojt/templates/ojt-configmap.yaml

@@ -13,3 +13,4 @@ data:
   {{- if .Values.mail.password }}
   grails.mail.password: {{ .Values.mail.password | quote }}
   {{- end }}
+  hclabs.ojt.loginUsingSso: {{ .Values.loginUsingSso | quote }}