From 731fd06da157e0a1a47e15872cb21966265707be Mon Sep 17 00:00:00 2001 From: Jorge Romero Date: Mon, 25 May 2026 12:38:12 +0200 Subject: [PATCH 1/2] Reserved words for OAS project components creation --- .../chart/templates/tpl/_application_yaml.tpl | 7 +++++-- .../chart/templates/tpl/_env_services.tpl | 5 ++++- .../chart/templates/tpl/_validations.tpl | 13 +++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/ods-api-service/chart/templates/tpl/_application_yaml.tpl b/ods-api-service/chart/templates/tpl/_application_yaml.tpl index 767c545e5..24e89064f 100644 --- a/ods-api-service/chart/templates/tpl/_application_yaml.tpl +++ b/ods-api-service/chart/templates/tpl/_application_yaml.tpl @@ -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} @@ -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: diff --git a/ods-api-service/chart/templates/tpl/_env_services.tpl b/ods-api-service/chart/templates/tpl/_env_services.tpl index 17352af24..7757f7b01 100644 --- a/ods-api-service/chart/templates/tpl/_env_services.tpl +++ b/ods-api-service/chart/templates/tpl/_env_services.tpl @@ -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 }} \ No newline at end of file +{{- end }} diff --git a/ods-api-service/chart/templates/tpl/_validations.tpl b/ods-api-service/chart/templates/tpl/_validations.tpl index 9e674df31..d71050bb7 100644 --- a/ods-api-service/chart/templates/tpl/_validations.tpl +++ b/ods-api-service/chart/templates/tpl/_validations.tpl @@ -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 */}} From ea81e4cd822f227f2f796825ba4debc2634c312f Mon Sep 17 00:00:00 2001 From: Jorge Romero Date: Mon, 25 May 2026 12:39:41 +0200 Subject: [PATCH 2/2] Changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 530323c26..81ff8750a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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