Skip to content

Commit 36c36d8

Browse files
tylervztylervz
committed
Add configmaps, update microservice versions for integrating with Workday
1 parent c6116ca commit 36c36d8

File tree

12 files changed

+97
-11
lines changed

12 files changed

+97
-11
lines changed

‎charts/thub/Chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ type: application
66
# This is the chart version. This version number should be incremented each time you make changes
77
# to the chart and its templates, including the app version.
88
# Versions are expected to follow Semantic Versioning (https://semver.org/)
9-
version: 1.6.8
9+
version: 1.7.0
1010

1111
# This is the version number of the application being deployed. This version number should be
1212
# 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
1717

1818
dependencies:
1919
- name: assigned-item-service
20-
version: 1.3.1
20+
version: 1.4.0
2121
- name: item-service
22-
version: 1.2.1
22+
version: 1.3.0
2323
- name: keycloak-config
2424
version: 0.1.1
2525
- name: lms-data-service
26-
version: 1.4.3
26+
version: 1.5.0
2727
- name: ojt
2828
version: 1.4.11
2929
- name: user-service

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ type: application
77
# This is the chart version. This version number should be incremented each time you make changes
88
# to the chart and its templates, including the app version.
99
# Versions are expected to follow Semantic Versioning (https://semver.org/)
10-
version: 1.3.1
10+
version: 1.4.0
1111

1212
# This is the version number of the application being deployed. This version number should be
1313
# incremented each time you make changes to the application. Versions are not expected to
1414
# follow Semantic Versioning. They should reflect the version the application is using.
15-
appVersion: v1.3.1
15+
appVersion: v1.4.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ type: application
77
# This is the chart version. This version number should be incremented each time you make changes
88
# to the chart and its templates, including the app version.
99
# Versions are expected to follow Semantic Versioning (https://semver.org/)
10-
version: 1.2.1
10+
version: 1.3.0
1111

1212
# This is the version number of the application being deployed. This version number should be
1313
# incremented each time you make changes to the application. Versions are not expected to
1414
# follow Semantic Versioning. They should reflect the version the application is using.
15-
appVersion: v1.3.0
15+
appVersion: v1.4.0

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ type: application
77
# This is the chart version. This version number should be incremented each time you make changes
88
# to the chart and its templates, including the app version.
99
# Versions are expected to follow Semantic Versioning (https://semver.org/)
10-
version: 1.4.3
10+
version: 1.5.0
1111

1212
# This is the version number of the application being deployed. This version number should be
1313
# incremented each time you make changes to the application. Versions are not expected to
1414
# follow Semantic Versioning. They should reflect the version the application is using.
15-
appVersion: v2.0.2
15+
appVersion: v2.1.1

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,20 @@ Create the name of the SFTP configmap
8282
{{ include "lms-data-service.name" . }}-sftp-config
8383
{{- end }}
8484

85+
{{/*
86+
Create the name of the Webservice configmap
87+
*/}}
88+
{{- define "lms-data-service.webserviceConfigmapName" -}}
89+
{{ include "lms-data-service.name" . }}-webservice-config
90+
{{- end }}
91+
92+
{{/*
93+
Create the name of the Workday setup configmap
94+
*/}}
95+
{{- define "lms-data-service.workdayConfigmapName" -}}
96+
{{ include "lms-data-service.name" . }}-workday-config
97+
{{- end }}
98+
8599
{{/*
86100
Create the name of the thub-event-scheduler-job input files configmap
87101
*/}}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,12 @@ spec:
8181
name: {{ include "lms-data-service.encryptionConfigmapName" . }}
8282
- configMapRef:
8383
name: {{ include "lms-data-service.sftpConfigmapName" . }}
84+
- configMapRef:
85+
name: {{ include "lms-data-service.webserviceConfigmapName" . }}
86+
{{- if eq .Values.global.lmsType "WORKDAY" }}
87+
- configMapRef:
88+
name: {{ include "lms-data-service.workdayConfigmapName" . }}
89+
{{- end }}
8490
# The keycloak ConfigMaps are defined in the keycloak-config chart
8591
- configMapRef:
8692
name: keycloak-shared-config

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# This will have different values for each client/namespace.
2+
apiVersion: v1
3+
kind: ConfigMap
4+
metadata:
5+
name: {{ include "lms-data-service.webserviceConfigmapName" . }}
6+
labels:
7+
{{- include "lms-data-service.labels" . | nindent 4 }}
8+
data:
9+
thub.setup.webservice.url: {{ .Values.webservice.url | quote }}
10+
{{- if eq .Values.global.lmsType "WORKDAY" }}
11+
thub.setup.webservice.username: {{ required "webservice.username cannot be emtpy when integrating with Workday" .Values.webservice.username | quote }}
12+
thub.setup.webservice.password: {{ required "webservice.password cannot be emtpy when integrating with Workday" .Values.webservice.password | quote }}
13+
{{- end }}
14+
# The Workday tenant name i.e. "calwatergroup1" or SuccessFactors companyID
15+
thub.setup.webservice.systemId: {{ .Values.webservice.systemId | quote }}
16+

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# This will have different values for each client/namespace.
2+
# This contains Environment Variables that need to be set when integrating with Workday.
3+
apiVersion: v1
4+
kind: ConfigMap
5+
metadata:
6+
name: {{ include "lms-data-service.workdayConfigmapName" . }}
7+
labels:
8+
{{- include "lms-data-service.labels" . | nindent 4 }}
9+
data:
10+
workday.api.readTimeoutMinutes: {{ .Values.workday.apiReadTimeoutMinutes | quote }}
11+
{{- if .Values.workday.apiVersion }}
12+
workday.api.version: {{ .Values.workday.apiVersion | quote }}
13+
{{- end }}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,21 @@ sftp:
119119
downloadDirectory: "FEED/DOWNLOAD/ROLLCALL"
120120
uploadDirectory: "FEED/UPLOAD"
121121

122+
# Webservice/API info to integrate with the LMS
123+
webservice:
124+
# Root URL for the LMS webservice
125+
url: "https://wd5-impl-services1.workday.com"
126+
username: ""
127+
password: ""
128+
# The Workday tenant name i.e. "calwatergroup1" or SuccessFactors companyID
129+
systemId: "calwatergroup1"
130+
131+
# Workday configuration
132+
workday:
133+
apiReadTimeoutMinutes: 17
134+
# Specify API version here to override the default defined by the LMS Data Service application.yml
135+
apiVersion: ""
136+
122137
assignedItemsSchedulerJob:
123138
enabled: true
124139
# Run on the 15th minute of every hour from 14 thru 23 and 5

‎charts/thub/templates/_helpers.tpl‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ Create the name of the LMS Data Service job queue
7979
Create the OJT Server URL / Ingress path
8080
*/}}
8181
{{- define "thub.ojtServerUrl" -}}
82-
{{- if .Values.global.ingress.enabled -}}
82+
{{- if and .Values.global.ingress.enabled .Values.global.ingress.ojtUrlPrefix -}}
83+
{{ print .Values.global.ingress.ojtUrlPrefix "." .Values.global.ingress.domain }}
84+
{{- else if .Values.global.ingress.enabled -}}
8385
{{ print "ojt-" .Release.Namespace "." .Values.global.ingress.domain }}
8486
{{- end }}
8587
{{- end }}
@@ -120,12 +122,14 @@ Create the contents of the Grails JMS properties file configmap
120122
jms.destinations.assignedItemQueue={{ .Release.Namespace }}-assignedItemQueue
121123
jms.destinations.assignedItemOjtCreationQueue={{ .Release.Namespace }}-assignedItemOjtCreationQueue
122124
jms.destinations.assignedItemOjtCreationResultsQueue={{ .Release.Namespace }}-assignedItemOjtCreationResultsQueue
125+
jms.destinations.attendeeRegistrationQueue={{ .Release.Namespace }}-attendeeRegistrationQueue
123126
jms.destinations.completionStatusQueue={{ .Release.Namespace }}-completionStatusQueue
124127
jms.destinations.instructorQueue={{ .Release.Namespace }}-instructorQueue
125128
jms.destinations.itemQueue={{ .Release.Namespace }}-itemQueue
126129
jms.destinations.learnerQueue={{ .Release.Namespace }}-learnerQueue
127130
jms.destinations.ojtJobQueue={{ include "thub.ojtJobQueueName" . }}
128131
jms.destinations.sfLmsDataJobQueue={{ include "thub.sfLmsDataJobQueueName" . }}
132+
jms.destinations.scheduledOfferingQueue={{ .Release.Namespace }}-scheduledOfferingQueue
129133
{{- end }}
130134

131135
{{/*

0 commit comments

Comments
 (0)