Skip to content

Ods api service/marketplace missing configuration #1378

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jorge-romero merged 7 commits into from
May 13, 2026
Merged

Ods api service/marketplace missing configuration #1378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ee67ca
Add configuration guide for ODS API Service Helm Chart
jorge-romero May 12, 2026
cda2a96
Add marketplace service config.
May 12, 2026
70f148b
Add marketplace service config.
May 12, 2026
d2e7771
Changes to make work again the application.yaml render
jorge-romero May 12, 2026
ebd8419
Fix merge error
jorge-romero May 13, 2026
343488e
remove not needed parameter
jorge-romero May 13, 2026
9219d5b
Add changelog
jorge-romero May 13, 2026
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
View file
Open in desktop
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))
- 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))

### Fixed

Expand Down
20 changes: 10 additions & 10 deletions ods-api-service/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ ods-api-service-render-helm-chart:

## Render the generated application.yaml from Helm templates to a local file.
ods-api-service-render-application-yaml:
@cd ods-api-service/chart && \
@cd chart && \
helm secrets template ods-api-service . \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.values.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.secrets.enc.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service.values.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/secrets.enc.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/$(env)/values.$(env).yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/$(env)/secrets.$(env).enc.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.values.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.secrets.enc.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/values.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/secrets.enc.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/$(env)/values.$(env).yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-api-service/$(env)/secrets.$(env).enc.yaml \
--set projectId=$(ODS_NAMESPACE) \
--set appSelector=app=ods-api-service \
--set registry=$(DOCKER_REGISTRY) \
Expand All @@ -66,13 +66,13 @@ ods-api-service-render-application-yaml:
--set global.imageNamespace=$(ODS_NAMESPACE) \
--set global.imageTag=$(ODS_IMAGE_TAG) \
--set ODS_OPENSHIFT_APP_DOMAIN=$(OPENSHIFT_APPS_BASEDOMAIN) \
2>/dev/null | \
yq -r 'select(.kind == "ConfigMap") | select(.metadata.name == "ods-api-service-config") | .data["application.yaml"]'
2>/dev/null | \
yq -r 'select(.kind == "ConfigMap") | select(.metadata.name == "ods-api-service-config") | .data["application.yaml"]'


## Render the generated .env file from Helm templates to a local file.
ods-api-service-renderdot-env:
@cd ods-api-service/chart && \
@cd chart && \
helm secrets template ods-api-service . \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.values.yaml \
-f $(ODS_CONFIGURATION_FULL_PATH)/ods-core.secrets.enc.yaml \
Expand Down
Loading
Loading