diff --git a/CHANGELOG.md b/CHANGELOG.md index 76608e0fc..8b6f0870d 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)) +- 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)) ### Fixed diff --git a/ods-api-service/chart/templates/tpl/_application_yaml.tpl b/ods-api-service/chart/templates/tpl/_application_yaml.tpl index 549474b74..104fb4d98 100644 --- a/ods-api-service/chart/templates/tpl/_application_yaml.tpl +++ b/ods-api-service/chart/templates/tpl/_application_yaml.tpl @@ -188,6 +188,7 @@ externalservices: provisioner-actions-base-url: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROVISIONER_ACTIONS_BASE_URL} username: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_USERNAME:} password: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PASSWORD:} + obo-scope: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_OBO_SCOPE:} trust-all-certificates: ${MARKETPLACE_{{ $name | upper | replace "-" "_" }}_TRUST_ALL:false} {{- end }} {{- else }} 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 93b23bdcd..1f246c28e 100644 --- a/ods-api-service/chart/templates/tpl/_env_external_services.tpl +++ b/ods-api-service/chart/templates/tpl/_env_external_services.tpl @@ -85,6 +85,8 @@ MARKETPLACE_DEFAULT_INSTANCE: {{ .Values.externalServices.marketplace.defaultIns MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROJECT_COMPONENT_BASE_URL: {{ $instance.projectComponentsBaseUrl | quote }} MARKETPLACE_{{ $name | upper | replace "-" "_" }}_PROVISIONER_ACTIONS_BASE_URL: {{ $instance.provisionerActionsBaseUrl | quote }} MARKETPLACE_{{ $name | upper | replace "-" "_" }}_TRUST_ALL: {{ $instance.trustAllCertificates | quote }} +MARKETPLACE_{{ $name | upper | replace "-" "_" }}_OBO_SCOPE: {{ $instance.oboScope | quote }} + {{- end }} {{- end }} {{- end }} diff --git a/ods-api-service/chart/templates/tpl/_validations.tpl b/ods-api-service/chart/templates/tpl/_validations.tpl index f4083a420..d0df30ac7 100644 --- a/ods-api-service/chart/templates/tpl/_validations.tpl +++ b/ods-api-service/chart/templates/tpl/_validations.tpl @@ -123,6 +123,9 @@ Validate Marketplace instances configuration {{- if or (not $instance.username) (not $instance.password) }} {{- fail (printf "username+password settings are required for Marketplace instance '%s'" $name) }} {{- end }} + {{- if not $instance.oboScope }} + {{- fail (printf "oboScope settings are required for Marketplace instance '%s'" $name) }} + {{- end }} {{- end }} {{- end -}} diff --git a/ods-api-service/chart/values.yaml.template b/ods-api-service/chart/values.yaml.template index daa66239f..7b0042fe3 100644 --- a/ods-api-service/chart/values.yaml.template +++ b/ods-api-service/chart/values.yaml.template @@ -274,6 +274,7 @@ externalServices: # dev: # projectComponentsBaseUrl: "$MARKETPLACE_DEV_PROJECT_COMPONENTS_BASE_URL" # provisionerActionsBaseUrl: "$MARKETPLACE_DEV_PROVISIONER_ACTIONS_BASE_URL" + # oboScope: "$MARKETPLACE_DEV_OBO_SCOPE" # trustAllCertificates: false # username: "" # Set in secrets.dev.enc.yaml # password: "" # Set in secrets.dev.enc.yaml