From c56615122dd6febda4f1ae381edcaf27498e1a63 Mon Sep 17 00:00:00 2001
From: andresanaya21 <alvaroandres.anayaamariles@telefonica.com>
Date: Fri, 17 Jan 2025 12:03:12 +0100
Subject: [PATCH] refactor: update capifHostname references in deployment
configurations for consistency
---
capif/templates/cd-deploy-ocf.gitlab-ci.yml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index 8530d1f..87df4b4 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -315,7 +315,7 @@ deploy_ocf_oficial_staging:
--set otelcollector.configMap.tempoEndpoint=ocf-staging-tempo:4317 \
--set ocf-access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api \
--set ocf-access-control-policy.image.tag=staging \
- --set ocf-access-control-policy.image.env.capifHostname=capif-staging.$DOMAIN_STAGING \
+ --set ocf-access-control-policy.env.capifHostname=capif-staging.$DOMAIN_STAGING \
--set ocf-access-control-policy.monitoring="true" \
--set ocf-api-invocation-logs.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-logging-api-invocation-api \
--set ocf-api-invocation-logs.image.tag=staging \
@@ -327,18 +327,21 @@ deploy_ocf_oficial_staging:
--set ocf-api-invoker-management.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-api-invoker-management-api \
--set ocf-api-invoker-management.image.tag=staging \
--set ocf-api-invoker-management.env.monitoring="true" \
+ --set ocf-api-invoker-management.env.capifHostname=capif-staging.$DOMAIN_STAGING \
--set ocf-api-invoker-management.env.vaultHostname=$VAULT_HOSTNAME \
--set ocf-api-invoker-management.env.vaultPort=$VAULT_PORT \
--set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \
--set ocf-api-provider-management.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-api-provider-management-api \
--set ocf-api-provider-management.image.tag=staging \
--set ocf-api-provider-management.env.monitoring="true" \
+ --set ocf-api-provider-management.env.capifHostname=capif-staging.$DOMAIN_STAGING \
--set ocf-api-provider-management.env.vaultHostname=$VAULT_HOSTNAME \
--set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \
--set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \
--set ocf-events.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-events-api \
--set ocf-events.image.tag=staging \
--set ocf-events.env.monitoring="true" \
+ --set ocf-events.env.capifHostname=capif-staging.$DOMAIN_STAGING \
--set ocf-routing-info.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-routing-info-api \
--set ocf-routing-info.image.tag=staging \
--set ocf-routing-info.env.monitoring="true" \
@@ -366,6 +369,7 @@ deploy_ocf_oficial_staging:
--set ocf-auditing-api-logs.env.monitoring="true" \
--set ocf-publish-service-api.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-publish-service-api \
--set ocf-publish-service-api.image.tag=staging \
+ --set ocf-publish-service-api.env.capifHostname=capif-staging.$DOMAIN_STAGING \
--set ocf-publish-service-api.env.monitoring="true" \
--set ocf-discover-service-api.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-discover-service-api \
--set ocf-discover-service-api.image.tag=staging \
@@ -482,7 +486,7 @@ deploy_ocf_dev:
--set otelcollector.configMap.tempoEndpoint=ocf-developer-tempo:4317 \
--set ocf-access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
--set ocf-access-control-policy.image.tag=$CI_COMMIT_REF_SLUG \
- --set ocf-access-control-policy.image.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \
+ --set ocf-access-control-policy.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \
--set ocf-access-control-policy.monitoring="true" \
--set ocf-access-control-policy.env.logLevel="DEBUG" \
--set ocf-api-invocation-logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api \
@@ -496,6 +500,7 @@ deploy_ocf_dev:
--set ocf-api-invoker-management.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api \
--set ocf-api-invoker-management.image.tag=$CI_COMMIT_REF_SLUG \
--set ocf-api-invoker-management.env.monitoring="true" \
+ --set ocf-api-invoker-management.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \
--set ocf-api-invoker-management.env.vaultHostname=$VAULT_HOSTNAME \
--set ocf-api-invoker-management.env.vaultPort=$VAULT_PORT \
--set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
@@ -503,6 +508,7 @@ deploy_ocf_dev:
--set ocf-api-provider-management.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api \
--set ocf-api-provider-management.image.tag=$CI_COMMIT_REF_SLUG \
--set ocf-api-provider-management.env.monitoring="true" \
+ --set ocf-api-provider-management.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \
--set ocf-api-provider-management.env.vaultHostname=$VAULT_HOSTNAME \
--set ocf-api-provider-management.env.logLevel="DEBUG" \
--set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \
@@ -510,6 +516,7 @@ deploy_ocf_dev:
--set ocf-events.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api \
--set ocf-events.image.tag=$CI_COMMIT_REF_SLUG \
--set ocf-events.env.monitoring="true" \
+ --set ocf-events.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \
--set ocf-events.env.logLevel="DEBUG" \
--set ocf-routing-info.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api \
--set ocf-routing-info.image.tag=$CI_COMMIT_REF_SLUG \
@@ -543,6 +550,7 @@ deploy_ocf_dev:
--set ocf-publish-service-api.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api \
--set ocf-publish-service-api.image.tag=$CI_COMMIT_REF_SLUG \
--set ocf-publish-service-api.env.monitoring="true" \
+ --set ocf-publish-service-api.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \
--set ocf-publish-service-api.env.logLevel="DEBUG" \
--set ocf-discover-service-api.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api \
--set ocf-discover-service-api.image.tag=$CI_COMMIT_REF_SLUG \
--
GitLab