From f47ff07dfa9e5746b2479b9f3979fecbe5dc7fef Mon Sep 17 00:00:00 2001 From: Jorge Romero Date: Tue, 19 May 2026 16:18:40 +0200 Subject: [PATCH 1/2] Add bitbucket-base-url to Marketplace instance configuration and validations --- ods-api-service/chart/templates/tpl/_application_yaml.tpl | 1 + ods-api-service/chart/templates/tpl/_env_external_services.tpl | 1 + ods-api-service/chart/templates/tpl/_validations.tpl | 3 +++ ods-api-service/chart/values.yaml.template | 1 + 4 files changed, 6 insertions(+) diff --git a/ods-api-service/chart/templates/tpl/_application_yaml.tpl b/ods-api-service/chart/templates/tpl/_application_yaml.tpl index 104fb4d98..767c545e5 100644 --- a/ods-api-service/chart/templates/tpl/_application_yaml.tpl +++ b/ods-api-service/chart/templates/tpl/_application_yaml.tpl @@ -186,6 +186,7 @@ externalservices: {{ $name }}: project-components-base-url: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROJECT_COMPONENTS_BASE_URL} provisioner-actions-base-url: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROVISIONER_ACTIONS_BASE_URL} + bitbucket-base-url: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_BITBUCKET_BASE_URL:} username: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_USERNAME:} password: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PASSWORD:} obo-scope: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_OBO_SCOPE:} diff --git a/ods-api-service/chart/templates/tpl/_env_external_services.tpl b/ods-api-service/chart/templates/tpl/_env_external_services.tpl index 669c3f399..ebcbbd0cb 100644 --- a/ods-api-service/chart/templates/tpl/_env_external_services.tpl +++ b/ods-api-service/chart/templates/tpl/_env_external_services.tpl @@ -84,6 +84,7 @@ MARKETPLACE_DEFAULT_INSTANCE: {{ .Values.externalServices.marketplace.defaultIns {{- range $name, $instance := .Values.externalServices.marketplace.instances }} MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROJECT_COMPONENTS_BASE_URL: {{ $instance.projectComponentsBaseUrl | quote }} MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROVISIONER_ACTIONS_BASE_URL: {{ $instance.provisionerActionsBaseUrl | quote }} +MARKETPLACE_{{ $name | upper | replace "-" "_" }}_BITBUCKET_BASE_URL: {{ $instance.bitbucketBaseUrl | quote }} MARKETPLACE_{{ $name | upper | replace "-" "_" }}_TRUST_ALL: {{ $instance.trustAllCertificates | quote }} MARKETPLACE_{{ $name | upper | replace "-" "_" }}_OBO_SCOPE: {{ $instance.oboScope | quote }} diff --git a/ods-api-service/chart/templates/tpl/_validations.tpl b/ods-api-service/chart/templates/tpl/_validations.tpl index d0df30ac7..9e674df31 100644 --- a/ods-api-service/chart/templates/tpl/_validations.tpl +++ b/ods-api-service/chart/templates/tpl/_validations.tpl @@ -120,6 +120,9 @@ Validate Marketplace instances configuration {{- if not $instance.provisionerActionsBaseUrl }} {{- fail (printf "provisionerActionsBaseUrl is required for Marketplace instance '%s'" $name) }} {{- end }} + {{- if not $instance.bitbucketBaseUrl }} + {{- fail (printf "bitbucketBaseUrl is required for Marketplace instance '%s'" $name) }} + {{- end }} {{- if or (not $instance.username) (not $instance.password) }} {{- fail (printf "username+password settings are required for Marketplace instance '%s'" $name) }} {{- end }} diff --git a/ods-api-service/chart/values.yaml.template b/ods-api-service/chart/values.yaml.template index 7b0042fe3..5f4473b15 100644 --- a/ods-api-service/chart/values.yaml.template +++ b/ods-api-service/chart/values.yaml.template @@ -275,6 +275,7 @@ externalServices: # projectComponentsBaseUrl: "$MARKETPLACE_DEV_PROJECT_COMPONENTS_BASE_URL" # provisionerActionsBaseUrl: "$MARKETPLACE_DEV_PROVISIONER_ACTIONS_BASE_URL" # oboScope: "$MARKETPLACE_DEV_OBO_SCOPE" + # bitbucketBaseUrl: "$_BITBUCKET_BASE_URL" # trustAllCertificates: false # username: "" # Set in secrets.dev.enc.yaml # password: "" # Set in secrets.dev.enc.yaml From 829793a9657b532351a553f1f40605a324039eed Mon Sep 17 00:00:00 2001 From: Jorge Romero Date: Tue, 19 May 2026 16:20:54 +0200 Subject: [PATCH 2/2] Add changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 50d313fa8..530323c26 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)) +- 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)) - 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