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
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
- Jenkins master and agent maintenance. Add Rhel9 variant and make it default ([#1361](https://github.com/opendevstack/ods-core/pull/1361))
- Update tailor to 1.4.0 ([#1373](https://github.com/opendevstack/ods-core/pull/1373))
- Update Jenkins java version to jdk 21 ([#1374](https://github.com/opendevstack/ods-core/pull/1374))
- Add new configuration for the ODS API Service ([1375](https://github.com/opendevstack/ods-core/pull/1375)) ([1377](https://github.com/opendevstack/ods-core/pull/1377))([1378](https://github.com/opendevstack/ods-core/pull/1378))([1379](https://github.com/opendevstack/ods-core/pull/1379))([1380](https://github.com/opendevstack/ods-core/pull/1380))([1382](https://github.com/opendevstack/ods-core/pull/1382))
- Add new configuration for the ODS API Service ([1375](https://github.com/opendevstack/ods-core/pull/1375)) ([1377](https://github.com/opendevstack/ods-core/pull/1377))([1378](https://github.com/opendevstack/ods-core/pull/1378))([1379](https://github.com/opendevstack/ods-core/pull/1379))([1380](https://github.com/opendevstack/ods-core/pull/1380))([1382](https://github.com/opendevstack/ods-core/pull/1382))([1383](https://github.com/opendevstack/ods-core/pull/1383))
- Change the way the certificates are installed in the container of ods-api-service to update the cacert ([1381](https://github.com/opendevstack/ods-core/pull/1381))

### Fixed
Expand Down
7 changes: 5 additions & 2 deletions ods-api-service/chart/templates/tpl/_application_yaml.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spring:
jwk-set-uri: ${OAUTH2_JWK_SET_URI:}
issuer-uri: ${OAUTH2_ISSUER:}
audiences:
- ${OAUTH2_AUDIENCE:}
- ${OAUTH2_AUDIENCE:}
datasource:
url: ${ODS_API_SERVICE_DB_DATASOURCE_URL}
username: ${ODS_API_SERVICE_DB_USER:opendevstack}
Expand Down Expand Up @@ -98,7 +98,10 @@ apis:
enabled: {{ .Values.apis.projects.enabled | default false }}
ansible-workflow-name: ${API_PROJECTS_MINIEDP_PROVISION_WORKFLOW_NAME:}
locations: ${API_PROJECTS_LOCATIONS:}

project-components:
enabled: {{ .Values.apis.projectComponents.enabled | default false }}
create:
reserved-params: ${API_PROJECT_COMPONENTS_RESERVED_PARAMS:}

# External Service Configuration
externalservices:
Expand Down
5 changes: 4 additions & 1 deletion ods-api-service/chart/templates/tpl/_env_services.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@ API_PROJECT_USERS_TOKEN_EXPIRATION_HOURS: {{ .Values.apis.projectUsers.token.exp
API_PROJECTS_MINIEDP_PROVISION_WORKFLOW_NAME: {{ .Values.apis.projects.workflowName | quote }}
API_PROJECTS_LOCATIONS: {{ .Values.apis.projects.locations | quote }}
{{ end }}
{{ if .Values.apis.projectComponents.enabled }}
API_PROJECT_COMPONENTS_RESERVED_PARAMS: {{ .Values.apis.projectComponents.create.reservedParams | quote }}
{{ end }}
{{- end }}

{{- define "chart.servicesSecretData" }}
{{ if .Values.apis.projectUsers.enabled }}
API_PROJECT_USERS_TOKEN_SECRET: {{ .Values.apis.projectUsers.token.secret | b64enc | quote }}
{{ end }}
{{- end }}
{{- end }}
13 changes: 13 additions & 0 deletions ods-api-service/chart/templates/tpl/_validations.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,19 @@ Validate Projects Info Service configuration when enabled
{{- end }}
{{- end -}}

{{/*
Validate Project Components Service configuration when enabled
*/}}
{{- define "chart.validate.projectComponents" -}}
{{- if .Values.externalServices.projectComponents.enabled }}
{{- if not .Values.externalServices.projectComponents.create.reservedParams }}
{{- fail "externalServices.projectComponents.create.reservedParams is required when projectComponents is enabled" }}
{{- end }}
{{- end }}
{{- end -}}



{{/*
Validate OpenShift instances configuration
*/}}
Expand Down
Loading