Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions charts/thub/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions charts/thub/charts/lms-data-service/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions charts/thub/charts/lms-data-service/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions charts/thub/charts/ojt/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions charts/thub/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions charts/thub/templates/shared-settings-configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
7 changes: 7 additions & 0 deletions charts/thub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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"
Expand Down