Update chart for integrating with Workday

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.6.8
+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
@@ -17,13 +17,13 @@ home: https://hypercision.github.io/helm-charts
 
 dependencies:
   - name: assigned-item-service
-    version: 1.3.1
+    version: 1.4.0
   - name: item-service
-    version: 1.2.1
+    version: 1.3.0
   - name: keycloak-config
     version: 0.1.1
   - name: lms-data-service
-    version: 1.4.3
+    version: 1.5.0
   - name: ojt
     version: 1.4.11
   - name: user-service

charts/thub/charts/assigned-item-service/Chart.yaml

@@ -7,9 +7,9 @@ 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.1
+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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v1.3.1
+appVersion: v1.4.0

charts/thub/charts/item-service/Chart.yaml

@@ -7,9 +7,9 @@ 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.2.1
+version: 1.3.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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v1.3.0
+appVersion: v1.4.0

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

@@ -7,9 +7,9 @@ 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.3
+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
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: v2.0.2
+appVersion: v2.1.1

charts/thub/charts/lms-data-service/templates/_helpers.tpl

@@ -82,6 +82,20 @@ Create the name of the SFTP configmap
 {{ include "lms-data-service.name" . }}-sftp-config
 {{- end }}
 
+{{/*
+Create the name of the Webservice configmap
+*/}}
+{{- define "lms-data-service.webserviceConfigmapName" -}}
+{{ include "lms-data-service.name" . }}-webservice-config
+{{- end }}
+
+{{/*
+Create the name of the Workday setup configmap
+*/}}
+{{- define "lms-data-service.workdayConfigmapName" -}}
+{{ include "lms-data-service.name" . }}-workday-config
+{{- end }}
+
 {{/*
 Create the name of the thub-event-scheduler-job input files configmap
 */}}

charts/thub/charts/lms-data-service/templates/deployment.yaml

@@ -81,6 +81,12 @@ spec:
               name: {{ include "lms-data-service.encryptionConfigmapName" . }}
           - configMapRef:
               name: {{ include "lms-data-service.sftpConfigmapName" . }}
+          - configMapRef:
+              name: {{ include "lms-data-service.webserviceConfigmapName" . }}
+          {{- if eq .Values.global.lmsType "WORKDAY" }}
+          - configMapRef:
+              name: {{ include "lms-data-service.workdayConfigmapName" . }}
+          {{- end }}
           # The keycloak ConfigMaps are defined in the keycloak-config chart
           - configMapRef:
               name: keycloak-shared-config

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

@@ -0,0 +1,16 @@
+# This will have different values for each client/namespace.
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "lms-data-service.webserviceConfigmapName" . }}
+  labels:
+    {{- include "lms-data-service.labels" . | nindent 4 }}
+data:
+  thub.setup.webservice.url: {{ .Values.webservice.url | quote }}
+  {{- if eq .Values.global.lmsType "WORKDAY" }}
+  thub.setup.webservice.username: {{ required "webservice.username cannot be emtpy when integrating with Workday" .Values.webservice.username | quote }}
+  thub.setup.webservice.password: {{ required "webservice.password cannot be emtpy when integrating with Workday" .Values.webservice.password | quote }}
+  {{- end }}
+  # The Workday tenant name i.e. "calwatergroup1" or SuccessFactors companyID
+  thub.setup.webservice.systemId: {{ .Values.webservice.systemId | quote }}
+

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

@@ -0,0 +1,13 @@
+# This will have different values for each client/namespace.
+# This contains Environment Variables that need to be set when integrating with Workday.
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "lms-data-service.workdayConfigmapName" . }}
+  labels:
+    {{- include "lms-data-service.labels" . | nindent 4 }}
+data:
+  workday.api.readTimeoutMinutes: {{ .Values.workday.apiReadTimeoutMinutes | quote }}
+  {{- if .Values.workday.apiVersion }}
+  workday.api.version: {{ .Values.workday.apiVersion | quote }}
+  {{- end }}

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

@@ -119,6 +119,21 @@ sftp:
   downloadDirectory: "FEED/DOWNLOAD/ROLLCALL"
   uploadDirectory: "FEED/UPLOAD"
 
+# Webservice/API info to integrate with the LMS
+webservice:
+  # Root URL for the LMS webservice
+  url: "https://wd5-impl-services1.workday.com"
+  username: ""
+  password: ""
+  # The Workday tenant name i.e. "calwatergroup1" or SuccessFactors companyID
+  systemId: "calwatergroup1"
+
+# Workday configuration
+workday:
+  apiReadTimeoutMinutes: 17
+  # Specify API version here to override the default defined by the LMS Data Service application.yml
+  apiVersion: ""
+
 assignedItemsSchedulerJob:
   enabled: true
   # Run on the 15th minute of every hour from 14 thru 23 and 5

charts/thub/templates/_helpers.tpl

@@ -79,7 +79,9 @@ Create the name of the LMS Data Service job queue
 Create the OJT Server URL / Ingress path
 */}}
 {{- define "thub.ojtServerUrl" -}}
-{{- if .Values.global.ingress.enabled -}}
+{{- if and .Values.global.ingress.enabled .Values.global.ingress.ojtUrlPrefix -}}
+{{ print .Values.global.ingress.ojtUrlPrefix "." .Values.global.ingress.domain }}
+{{- else if .Values.global.ingress.enabled -}}
 {{ print "ojt-" .Release.Namespace "." .Values.global.ingress.domain }}
 {{- end }}
 {{- end }}
@@ -120,12 +122,14 @@ Create the contents of the Grails JMS properties file configmap
 jms.destinations.assignedItemQueue={{ .Release.Namespace }}-assignedItemQueue
 jms.destinations.assignedItemOjtCreationQueue={{ .Release.Namespace }}-assignedItemOjtCreationQueue
 jms.destinations.assignedItemOjtCreationResultsQueue={{ .Release.Namespace }}-assignedItemOjtCreationResultsQueue
+jms.destinations.attendeeRegistrationQueue={{ .Release.Namespace }}-attendeeRegistrationQueue
 jms.destinations.completionStatusQueue={{ .Release.Namespace }}-completionStatusQueue
 jms.destinations.instructorQueue={{ .Release.Namespace }}-instructorQueue
 jms.destinations.itemQueue={{ .Release.Namespace }}-itemQueue
 jms.destinations.learnerQueue={{ .Release.Namespace }}-learnerQueue
 jms.destinations.ojtJobQueue={{ include "thub.ojtJobQueueName" . }}
 jms.destinations.sfLmsDataJobQueue={{ include "thub.sfLmsDataJobQueueName" . }}
+jms.destinations.scheduledOfferingQueue={{ .Release.Namespace }}-scheduledOfferingQueue
 {{- end }}
 
 {{/*

charts/thub/templates/shared-settings-configmap.yaml

@@ -20,6 +20,7 @@ data:
   hclabs.enableOjtObserverComments: {{ .Values.enableOjtObserverComments | quote }}
   hclabs.enableSelfAssessmentRatings: {{ .Values.enableSelfAssessmentRatings | quote }}
   hclabs.eSignatureMeaningCode: {{ .Values.eSignatureMeaningCode | quote }}
+  hclabs.lmsType: {{ .Values.global.lmsType | quote }}
   hclabs.ojt.allowedTiles: {{ .Values.ojtAllowedTiles | quote }}
   hclabs.ojt.blockAllTiles: {{ .Values.ojtBlockAllTiles | quote }}
   hclabs.ojt.requireTotalHours: {{ .Values.ojtRequireTotalHours | quote }}

charts/thub/values.yaml

@@ -175,6 +175,19 @@ lms-data-service:
     password: ""
     downloadDirectory: "FEED/DOWNLOAD/ROLLCALL"
     uploadDirectory: "FEED/UPLOAD"
+  # Webservice/API info to integrate with the LMS
+  webservice:
+    # Root URL for the LMS webservice
+    url: "https://wd5-impl-services1.workday.com"
+    username: ""
+    password: ""
+    # The Workday tenant name i.e. "calwatergroup1" or SuccessFactors companyID
+    systemId: "calwatergroup1"
+  # Workday configuration
+  workday:
+    apiReadTimeoutMinutes: 17
+    # Specify API version here to override the default defined by the LMS Data Service application.yml
+    apiVersion: ""
   assignedItemsSchedulerJob:
     enabled: true
     # Run on the 15th minute of every hour from 14 thru 23 and 5
@@ -297,6 +310,8 @@ global:
   awsS3AccessConfigMapName: aws-s3-access-config
   jmsPropertiesConfigMapName: jms-properties-grails-app-config
   sharedSettingsConfigMapName: shared-settings-config
+  # LMS type that we are integrating with. "SFLMS" or "WORKDAY"
+  lmsType: "SFLMS"
   ingress:
     enabled: true
     # Default to alb for AWS
@@ -315,6 +330,8 @@ global:
       alb.ingress.kubernetes.io/healthcheck-path: /healthCheck
       alb.ingress.kubernetes.io/healthcheck-timeout-seconds: '5'
     domain: "hcl-testcloud.com"
+    # Prefix for OJT Server URL / Ingress path. Defaults to "ojt-<namespace>"
+    ojtUrlPrefix: ""
   # Resources for the thub-event-scheduler-job container
   eventSchedulerResources:
     requests: