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.9.0
+version: 1.10.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
@@ -21,11 +21,11 @@ dependencies:
   - name: item-service
     version: 1.4.0
   - name: keycloak-config
-    version: 0.1.1
+    version: 0.1.2
   - name: lms-data-service
-    version: 1.7.0
+    version: 1.8.0
   - name: ojt
-    version: 1.6.0
+    version: 1.7.0
   - name: user-service
     version: 1.4.0
 

charts/thub/charts/keycloak-config/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: 0.1.1
+version: 0.1.2
 
 # 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/keycloak-config/templates/keycloak-configmap.yaml

@@ -9,8 +9,7 @@ metadata:
 data:
   # Public URL for accessing the Keycloak server on the internet
   keycloak.publicServerUrl: {{ .Values.publicServerUrl | quote }}
-  # URL which is only accessible within the k8s cluster
-  grails.plugin.springsecurity.rest.keycloak.serverUrl: {{ .Values.internalServerUrl | quote }}
+  grails.plugin.springsecurity.rest.keycloak.serverUrl: {{ .Values.publicServerUrl | quote }}
   grails.plugin.springsecurity.rest.keycloak.masterAdminUsername: {{ required "masterAdminUsername cannot be emtpy" .Values.masterAdminUsername | quote }}
 ---
 {{- if .Values.realmConfigmapEnabled }}
@@ -33,4 +32,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.7.0
+version: 1.8.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/templates/lms-data-service-configmap.yaml

@@ -15,3 +15,4 @@ data:
   {{ $key }}: {{ $value | quote }}
   {{- end }}
   {{- end }}
+  hclabs.lmsDataService.loginUsingSso: {{ .Values.loginUsingSso | quote }}

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

@@ -112,6 +112,10 @@ affinity: {}
 # For example, custom.property.one: "value1"
 additionalConfig: {}
 
+# 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
+
 # Encryption key for storing sensitive values in the database
 encryptionPassword: ""
 

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.6.0
+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/ojt/templates/ojt-configmap.yaml

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

charts/thub/charts/ojt/values.yaml

@@ -117,6 +117,10 @@ mail:
 # For example, custom.property.one: "value1"
 additionalConfig: {}
 
+# Boolean that when true, users will login to OJT using a SSO authentication provider
+# with a redirect URL rather than entering their their credentials on the OJT web app login page.
+loginUsingSso: true
+
 learningHistorySchedulerJob:
   enabled: true
   # Run every 30 minutes