diff --git a/charts/thub/Chart.yaml b/charts/thub/Chart.yaml index 84aa222..ce9c9e3 100644 --- a/charts/thub/Chart.yaml +++ b/charts/thub/Chart.yaml @@ -6,12 +6,12 @@ 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.12 +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 # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: 2.0.0 +appVersion: 2.1.0 home: https://hypercision.github.io/helm-charts @@ -23,9 +23,9 @@ dependencies: - name: keycloak-config version: 0.1.1 - name: lms-data-service - version: 1.5.5 + version: 1.6.0 - name: ojt - version: 1.4.14 + version: 1.5.0 - name: user-service version: 1.3.4 diff --git a/charts/thub/charts/lms-data-service/Chart.yaml b/charts/thub/charts/lms-data-service/Chart.yaml index 9fa9460..efc2088 100644 --- a/charts/thub/charts/lms-data-service/Chart.yaml +++ b/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.5.5 +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 # follow Semantic Versioning. They should reflect the version the application is using. -appVersion: v2.1.4 +appVersion: v2.2.0 diff --git a/charts/thub/charts/lms-data-service/templates/deployment.yaml b/charts/thub/charts/lms-data-service/templates/deployment.yaml index 224af27..77d914c 100644 --- a/charts/thub/charts/lms-data-service/templates/deployment.yaml +++ b/charts/thub/charts/lms-data-service/templates/deployment.yaml @@ -50,6 +50,8 @@ spec: {{- toYaml .Values.resources | nindent 12 }} env: {{- include "thub.lmsDataServiceServerUrlEnv" . | nindent 10 }} + - name: services.item + value: "http://{{ .Values.global.itemService.serviceName }}:{{ .Values.global.itemService.servicePort }}" - name: server.port value: {{ .Values.global.lmsDataService.servicePort | quote }} # The keycloak-shared-secret and keycloak-realm-secret are defined in the keycloak-config chart diff --git a/charts/thub/charts/ojt/Chart.yaml b/charts/thub/charts/ojt/Chart.yaml index 4d9441d..6e65371 100644 --- a/charts/thub/charts/ojt/Chart.yaml +++ b/charts/thub/charts/ojt/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.14 +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.1.12 +appVersion: v2.2.0 diff --git a/charts/thub/templates/_helpers.tpl b/charts/thub/templates/_helpers.tpl index c4a2866..2d44c71 100644 --- a/charts/thub/templates/_helpers.tpl +++ b/charts/thub/templates/_helpers.tpl @@ -124,6 +124,8 @@ jms.destinations.assignedItemOjtCreationQueue={{ .Release.Namespace }}-assignedI jms.destinations.assignedItemOjtCreationResultsQueue={{ .Release.Namespace }}-assignedItemOjtCreationResultsQueue jms.destinations.attendeeRegistrationQueue={{ .Release.Namespace }}-attendeeRegistrationQueue jms.destinations.completionStatusQueue={{ .Release.Namespace }}-completionStatusQueue +jms.destinations.createCourseOfferingQueue={{ .Release.Namespace }}-createCourseOfferingQueue +jms.destinations.createCourseOfferingResultsQueue={{ .Release.Namespace }}-createCourseOfferingResultsQueue jms.destinations.instructorQueue={{ .Release.Namespace }}-instructorQueue jms.destinations.itemQueue={{ .Release.Namespace }}-itemQueue jms.destinations.learnerQueue={{ .Release.Namespace }}-learnerQueue diff --git a/charts/thub/templates/shared-settings-configmap.yaml b/charts/thub/templates/shared-settings-configmap.yaml index 7380caa..4035d05 100644 --- a/charts/thub/templates/shared-settings-configmap.yaml +++ b/charts/thub/templates/shared-settings-configmap.yaml @@ -13,6 +13,9 @@ data: hclabs.awsS3LearningHistoryBucketName: {{ .Values.awsS3LearningHistoryBucketName | quote }} hclabs.createOjtsFromAssignedItems: {{ .Values.createOjtsFromAssignedItems | quote }} hclabs.dataSyncScheduleLink: {{ .Values.dataSyncScheduleLink | quote }} + {{- if .Values.defaultLengthOfOjtInDays}} + hclabs.defaultLengthOfOjtInDays: {{ .Values.defaultLengthOfOjtInDays | quote }} + {{- end }} hclabs.defaultOjtStepType: {{ .Values.defaultOjtStepType | quote }} hclabs.desiredItemTypes: {{ .Values.desiredItemTypes | quote }} hclabs.enableAssessmentType: {{ .Values.enableAssessmentType | quote }} @@ -28,6 +31,7 @@ data: {{- if .Values.roleNeededForApprover}} hclabs.roleNeededForApprover: {{ .Values.roleNeededForApprover | quote }} {{- end }} + hclabs.sendCreateCourseOfferingMessages: {{ .Values.sendCreateCourseOfferingMessages | quote }} hclabs.sfLearningHistoryConnectorTimeZone: {{ .Values.sfLearningHistoryConnectorTimeZone | quote }} hclabs.sfLearningHistoryEsUserName: {{ .Values.sfLearningHistoryEsUserName | quote }} hclabs.sfLearningHistoryLastUpdatedUser: {{ .Values.sfLearningHistoryLastUpdatedUser | quote }} diff --git a/charts/thub/values.yaml b/charts/thub/values.yaml index 007fbdd..2f0447e 100644 --- a/charts/thub/values.yaml +++ b/charts/thub/values.yaml @@ -20,6 +20,10 @@ awsS3LearningHistoryBucketName: "hclabs-dev-traininghub-learning-history" createOjtsFromAssignedItems: true # Link to a Google Sheet that explains how often each Data Sync job runs. dataSyncScheduleLink: "" +# Specify here to override the default defined by the OJT and LMS Data Service application.yml +# The default number of days added to an OJT's start date to determine the +# end date of its corresponding Course Offering in Workday. +defaultLengthOfOjtInDays: "" # The `StepType` to use by default when adding another step to an OJT Course defaultOjtStepType: "COMPLETE_INCOMPLETE" # Item types that should be loaded in by the LMS Data Service. @@ -51,6 +55,9 @@ onlySeeOjtsInYourOrganization: false # Specify role here to override the default defined by the OJT application.yml # In order for a Learner/User to be an approver for an OJT or OJTCourse, they need to have this specified role. roleNeededForApprover: "" +# When this is true, `CreateCourseOfferingMessage` objects are sent from OJT to the LMS Data Service +# to create or update a Course Offering and Learning Enrollment in Workday which correspond to an OJT. +sendCreateCourseOfferingMessages: true # The timezone that SuccessFactors expects date and time values to be in the learning history connector input file. # It is in a format that can be used by `java.util.TimeZone.getTimeZone()`. This value can be different for each client. sfLearningHistoryConnectorTimeZone: "GMT"