diff --git a/capif/.gitlab-ci.yml b/capif/.gitlab-ci.yml index b53821add428ba7c28eeb486310ce9ea773cb434..1d7ca29e3c0482c2cde229a59102c3543f9bb6a8 100644 --- a/capif/.gitlab-ci.yml +++ b/capif/.gitlab-ci.yml @@ -644,7 +644,7 @@ deploy_ocf_main: --set ocf-api-invocation-logs.image.tag=$CI_COMMIT_REF_SLUG \ --set ocf-api-invocation-logs.env.monitoring="true" \ --set ocf-api-invocation-logs.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \ - --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-api-invocation-logs.env.vaultPort=$VAULT_PORT \ --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-api-invocation-logs.env.logLevel="INFO" \ @@ -652,7 +652,7 @@ deploy_ocf_main: --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-main.$DOMAIN_PRE_PROD \ - --set ocf-api-invoker-management.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-invoker-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-api-invoker-management.env.vaultPort=$VAULT_PORT \ --set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-api-invoker-management.env.logLevel="INFO" \ @@ -660,7 +660,7 @@ deploy_ocf_main: --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-main.$DOMAIN_PRE_PROD \ - --set ocf-api-provider-management.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-provider-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \ --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-api-provider-management.env.logLevel="INFO" \ @@ -677,13 +677,13 @@ deploy_ocf_main: --set ocf-security.image.tag=$CI_COMMIT_REF_SLUG \ --set ocf-security.env.monitoring="true" \ --set ocf-security.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \ - --set ocf-security.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-security.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-security.env.vaultPort=$VAULT_PORT \ --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-security.env.logLevel="INFO" \ --set ocf-register.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register \ --set ocf-register.image.tag=$CI_COMMIT_REF_SLUG \ - --set ocf-register.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-register.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-register.env.vaultPort=$VAULT_PORT \ --set ocf-register.env.mongoHost=mongo-register \ @@ -710,7 +710,7 @@ deploy_ocf_main: --set nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \ --set nginx.image.tag=$CI_COMMIT_REF_SLUG \ --set nginx.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \ - --set nginx.env.vaultHostname=$VAULT_HOSTNAME \ + --set nginx.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set nginx.env.vaultPort=$VAULT_PORT \ --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set nginx.ingress.enabled=true \ @@ -720,7 +720,7 @@ deploy_ocf_main: --set nginx.env.logLevel="info" \ --set ocf-helper.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper \ --set ocf-helper.image.tag=$CI_COMMIT_REF_SLUG \ - --set ocf-helper.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-helper.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-helper.env.vaultPort=$VAULT_PORT \ --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-helper.env.capifHostname=capif-main.$DOMAIN_PRE_PROD \ @@ -786,7 +786,8 @@ deploy_ocf_main: export BASE_DOCKER_REGISTRY=labs.etsi.org:5050/ocf/capif export CAPIF_DOCKER_REGISTRY=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG export CAPIF_IMAGE_TAG=$CI_COMMIT_REF_SLUG - export VAULT_INTERNAL_HOSTNAME=$VAULT_HOSTNAME + export VAULT_INTERNAL_HOSTNAME=$VAULT_INTERNAL_HOSTNAME_PROD + export VAULT_HOSTNAME=$VAULT_HOSTNAME_PROD export VAULT_PORT=$VAULT_PORT export VAULT_ACCESS_TOKEN= diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml index 6345f2d078c86eb35c687a4b8d6573a308efdbd3..fcc0446646348181b401ed0e1c8accad00bc5e04 100644 --- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml +++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml @@ -14,9 +14,13 @@ variables: # CI_JOB_TOKEN: $CI_JOB_TOKEN IMAGE_TAG_DEV: $CI_COMMIT_REF_SLUG IMAGE_TAG_STAGING: $CI_COMMIT_REF_SLUG - VAULT_HOSTNAME: $VAULT_HOSTNAME + VAULT_HOSTNAME_DEV: $VAULT_HOSTNAME_DEV + VAULT_HOSTNAME_PROD: $VAULT_HOSTNAME_PROD + VAULT_INTERNAL_HOSTNAME_DEV: $VAULT_INTERNAL_HOSTNAME_DEV + VAULT_INTERNAL_HOSTNAME_PROD: $VAULT_INTERNAL_HOSTNAME_PROD VAULT_PORT: $VAULT_PORT - VAULT_ACCESS_TOKEN: $VAULT_ACCESS_TOKEN + VAULT_ACCESS_TOKEN_DEV: $VAULT_ACCESS_TOKEN_DEV + VAULT_ACCESS_TOKEN_PROD: $VAULT_ACCESS_TOKEN_PROD # CI_REGISTRY: $CI_REGISTRY .staging_common: &staging_common @@ -148,25 +152,25 @@ deploy_ocf_staging: --set ocf-api-invocation-logs.image.tag=$CI_COMMIT_REF_SLUG \ --set ocf-api-invocation-logs.env.monitoring="true" \ --set ocf-api-invocation-logs.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \ - --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-api-invocation-logs.env.vaultPort=$VAULT_PORT \ - --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-api-invocation-logs.env.logLevel="DEBUG" \ --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-mr.$DOMAIN_DEV \ - --set ocf-api-invoker-management.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-invoker-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-api-invoker-management.env.vaultPort=$VAULT_PORT \ - --set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-api-invoker-management.env.logLevel="DEBUG" \ --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-mr.$DOMAIN_DEV \ - --set ocf-api-provider-management.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-provider-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \ - --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-api-provider-management.env.logLevel="DEBUG" \ --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 \ @@ -181,15 +185,15 @@ deploy_ocf_staging: --set ocf-security.image.tag=$CI_COMMIT_REF_SLUG \ --set ocf-security.env.monitoring="true" \ --set ocf-security.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \ - --set ocf-security.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-security.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-security.env.vaultPort=$VAULT_PORT \ - --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-security.env.logLevel="DEBUG" \ --set ocf-register.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register \ --set ocf-register.image.tag=$CI_COMMIT_REF_SLUG \ --set ocf-register.env.registerHostname=register-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \ - --set ocf-register.env.vaultHostname=$VAULT_HOSTNAME \ - --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-register.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ + --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-register.env.vaultPort=$VAULT_PORT \ --set ocf-register.env.mongoHost=mongo-register \ --set ocf-register.env.mongoPort=27017 \ @@ -215,9 +219,9 @@ deploy_ocf_staging: --set nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \ --set nginx.image.tag=$CI_COMMIT_REF_SLUG \ --set nginx.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \ - --set nginx.env.vaultHostname=$VAULT_HOSTNAME \ + --set nginx.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set nginx.env.vaultPort=$VAULT_PORT \ - --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set nginx.ingress.enabled=true \ --set nginx.ingress.hosts[0].host=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \ --set nginx.ingress.hosts[0].paths[0].path="/" \ @@ -225,9 +229,9 @@ deploy_ocf_staging: --set nginx.env.logLevel="info" \ --set ocf-helper.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper \ --set ocf-helper.image.tag=$CI_COMMIT_REF_SLUG \ - --set ocf-helper.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-helper.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-helper.env.vaultPort=$VAULT_PORT \ - --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-helper.env.capifHostname=capif-$CI_ENV_ENDPOINT-mr.$DOMAIN_DEV \ --set ocf-helper.env.logLevel="DEBUG" \ --set mock-server.enabled=true \ @@ -295,7 +299,8 @@ deploy_ocf_staging: export BASE_DOCKER_REGISTRY=labs.etsi.org:5050/ocf/capif export CAPIF_DOCKER_REGISTRY=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG export CAPIF_IMAGE_TAG=$CI_COMMIT_REF_SLUG - export VAULT_INTERNAL_HOSTNAME=$VAULT_HOSTNAME + export VAULT_INTERNAL_HOSTNAME=$VAULT_INTERNAL_HOSTNAME_DEV + export VAULT_HOSTNAME=$VAULT_HOSTNAME_DEV export VAULT_PORT=$VAULT_PORT export VAULT_ACCESS_TOKEN= @@ -341,7 +346,7 @@ deploy_ocf_staging: # Only Common configuration of env apply to both mongo express components. REGISTER_HOSTNAME # -------------------------------------------------------------------------------------------------------------- EOF - sed -e "s/^[ ]*export VAULT_ACCESS_TOKEN=.*/export VAULT_ACCESS_TOKEN=$VAULT_ACCESS_TOKEN/" \ + sed -e "s/^[ ]*export VAULT_ACCESS_TOKEN=.*/export VAULT_ACCESS_TOKEN=$VAULT_ACCESS_TOKEN_DEV/" \ helm/scripts/envs/$NAMESPACE_DEV_TO_STAGING-mr.template > helm/scripts/envs/$NAMESPACE_DEV_TO_STAGING-mr.env ./helm/scripts/install_capif.sh $NAMESPACE_DEV_TO_STAGING-mr kubectl delete pod --field-selector=status.phase=Failed -n $NAMESPACE_DEV_TO_STAGING-mr @@ -391,7 +396,8 @@ delete_ocf_staging: export BASE_DOCKER_REGISTRY=labs.etsi.org:5050/ocf/capif export CAPIF_DOCKER_REGISTRY=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG export CAPIF_IMAGE_TAG=$CI_COMMIT_REF_SLUG - export VAULT_INTERNAL_HOSTNAME=$VAULT_HOSTNAME + export VAULT_INTERNAL_HOSTNAME=$VAULT_INTERNAL_HOSTNAME_DEV + export VAULT_HOSTNAME=$VAULT_HOSTNAME_DEV export VAULT_PORT=$VAULT_PORT export VAULT_ACCESS_TOKEN= @@ -438,7 +444,7 @@ delete_ocf_staging: # Only Common configuration of env apply to both mongo express components. REGISTER_HOSTNAME # -------------------------------------------------------------------------------------------------------------- EOF - sed -e "s/^[ ]*export VAULT_ACCESS_TOKEN=.*/export VAULT_ACCESS_TOKEN=$VAULT_ACCESS_TOKEN/" \ + sed -e "s/^[ ]*export VAULT_ACCESS_TOKEN=.*/export VAULT_ACCESS_TOKEN=$VAULT_ACCESS_TOKEN_DEV/" \ helm/scripts/envs/$NAMESPACE_DEV_TO_STAGING-mr.template > helm/scripts/envs/$NAMESPACE_DEV_TO_STAGING-mr.env fi @@ -523,7 +529,7 @@ deploy_ocf_oficial_staging: --set ocf-api-invocation-logs.env.monitoring="true" \ --set ocf-api-invocation-logs.env.logLevel="DEBUG" \ --set ocf-api-invocation-logs.env.capifHostname=capif-staging.$DOMAIN_STAGING \ - --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-api-invocation-logs.env.vaultPort=$VAULT_PORT \ --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-api-invoker-management.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-api-invoker-management-api \ @@ -531,7 +537,7 @@ deploy_ocf_oficial_staging: --set ocf-api-invoker-management.env.monitoring="true" \ --set ocf-api-invoker-management.env.logLevel="DEBUG" \ --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.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --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 \ @@ -539,7 +545,7 @@ deploy_ocf_oficial_staging: --set ocf-api-provider-management.env.monitoring="true" \ --set ocf-api-provider-management.env.logLevel="DEBUG" \ --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.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --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 \ @@ -555,14 +561,14 @@ deploy_ocf_oficial_staging: --set ocf-security.env.logLevel="DEBUG" \ --set ocf-security.env.monitoring="true" \ --set ocf-security.env.capifHostname=capif-staging.$DOMAIN_STAGING \ - --set ocf-security.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-security.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-security.env.vaultPort=$VAULT_PORT \ --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-register.image.repository=$CI_REGISTRY/ocf/capif/staging/register \ --set ocf-register.image.tag=staging \ --set ocf-register.env.logLevel="DEBUG" \ --set ocf-register.env.registerHostname=register-staging.$DOMAIN_STAGING \ - --set ocf-register.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-register.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-register.env.vaultPort=$VAULT_PORT \ --set ocf-register.env.mongoHost=mongo-register \ @@ -588,7 +594,7 @@ deploy_ocf_oficial_staging: --set nginx.image.repository=$CI_REGISTRY/ocf/capif/staging/nginx \ --set nginx.image.tag=staging \ --set nginx.env.capifHostname=capif-staging.$DOMAIN_STAGING \ - --set nginx.env.vaultHostname=$VAULT_HOSTNAME \ + --set nginx.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set nginx.env.vaultPort=$VAULT_PORT \ --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set nginx.ingress.enabled=true \ @@ -597,7 +603,7 @@ deploy_ocf_oficial_staging: --set nginx.ingress.hosts[0].paths[0].pathType="Prefix" \ --set ocf-helper.image.repository=$CI_REGISTRY/ocf/capif/staging/helper \ --set ocf-helper.image.tag=staging \ - --set ocf-helper.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-helper.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-helper.env.vaultPort=$VAULT_PORT \ --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-helper.env.capifHostname=capif-staging.$DOMAIN_STAGING \ @@ -667,7 +673,8 @@ deploy_ocf_oficial_staging: export BASE_DOCKER_REGISTRY=labs.etsi.org:5050/ocf/capif export CAPIF_DOCKER_REGISTRY=$CI_REGISTRY/ocf/capif/staging export CAPIF_IMAGE_TAG=staging - export VAULT_INTERNAL_HOSTNAME=$VAULT_HOSTNAME + export VAULT_INTERNAL_HOSTNAME=$VAULT_INTERNAL_HOSTNAME_PROD + export VAULT_HOSTNAME=$VAULT_HOSTNAME_PROD export VAULT_PORT=$VAULT_PORT export VAULT_ACCESS_TOKEN= @@ -816,26 +823,26 @@ deploy_ocf_dev: --set ocf-api-invocation-logs.image.tag=$CI_COMMIT_REF_SLUG \ --set ocf-api-invocation-logs.env.monitoring="true" \ --set ocf-api-invocation-logs.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \ - --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-api-invocation-logs.env.vaultPort=$VAULT_PORT \ - --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-api-invocation-logs.env.logLevel="DEBUG" \ --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.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-api-invoker-management.env.vaultPort=$VAULT_PORT \ - --set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-api-invoker-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-api-invoker-management.env.logLevel="DEBUG" \ --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.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-api-provider-management.env.logLevel="DEBUG" \ --set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \ - --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_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" \ @@ -849,15 +856,15 @@ deploy_ocf_dev: --set ocf-security.image.tag=$CI_COMMIT_REF_SLUG \ --set ocf-security.env.monitoring="true" \ --set ocf-security.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \ - --set ocf-security.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-security.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-security.env.vaultPort=$VAULT_PORT \ - --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-security.env.logLevel="DEBUG" \ --set ocf-register.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register \ --set ocf-register.image.tag=$CI_COMMIT_REF_SLUG \ --set ocf-register.env.registerHostname=register-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \ - --set ocf-register.env.vaultHostname=$VAULT_HOSTNAME \ - --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-register.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ + --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-register.env.vaultPort=$VAULT_PORT \ --set ocf-register.env.mongoHost=mongo-register \ --set ocf-register.env.mongoPort=27017 \ @@ -883,9 +890,9 @@ deploy_ocf_dev: --set nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \ --set nginx.image.tag=$CI_COMMIT_REF_SLUG \ --set nginx.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \ - --set nginx.env.vaultHostname=$VAULT_HOSTNAME \ + --set nginx.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set nginx.env.vaultPort=$VAULT_PORT \ - --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set nginx.ingress.enabled=true \ --set nginx.ingress.hosts[0].host=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \ --set nginx.ingress.hosts[0].paths[0].path="/" \ @@ -893,9 +900,9 @@ deploy_ocf_dev: --set nginx.env.logLevel="debug" \ --set ocf-helper.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper \ --set ocf-helper.image.tag=$CI_COMMIT_REF_SLUG \ - --set ocf-helper.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-helper.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_DEV \ --set ocf-helper.env.vaultPort=$VAULT_PORT \ - --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_DEV \ --set ocf-helper.env.capifHostname=capif-$CI_ENV_ENDPOINT-dev.$DOMAIN_DEV \ --set ocf-helper.env.logLevel="DEBUG" \ --set mock-server.enabled=true \ @@ -963,7 +970,8 @@ deploy_ocf_dev: export BASE_DOCKER_REGISTRY=labs.etsi.org:5050/ocf/capif export CAPIF_DOCKER_REGISTRY=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG export CAPIF_IMAGE_TAG=$CI_COMMIT_REF_SLUG - export VAULT_INTERNAL_HOSTNAME=$VAULT_HOSTNAME + export VAULT_INTERNAL_HOSTNAME=$VAULT_INTERNAL_HOSTNAME_DEV + export VAULT_HOSTNAME=$VAULT_HOSTNAME_DEV export VAULT_PORT=$VAULT_PORT export VAULT_ACCESS_TOKEN= @@ -1009,7 +1017,7 @@ deploy_ocf_dev: # Only Common configuration of env apply to both mongo express components. REGISTER_HOSTNAME # -------------------------------------------------------------------------------------------------------------- EOF - sed -e "s/^[ ]*export VAULT_ACCESS_TOKEN=.*/export VAULT_ACCESS_TOKEN=$VAULT_ACCESS_TOKEN/" \ + sed -e "s/^[ ]*export VAULT_ACCESS_TOKEN=.*/export VAULT_ACCESS_TOKEN=$VAULT_ACCESS_TOKEN_DEV/" \ helm/scripts/envs/$NAMESPACE_DEV.template > helm/scripts/envs/$NAMESPACE_DEV.env ./helm/scripts/install_capif.sh $NAMESPACE_DEV kubectl delete pod --field-selector=status.phase=Failed -n $NAMESPACE_DEV @@ -1055,7 +1063,8 @@ delete_ocf_dev: export BASE_DOCKER_REGISTRY=labs.etsi.org:5050/ocf/capif export CAPIF_DOCKER_REGISTRY=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG export CAPIF_IMAGE_TAG=$CI_COMMIT_REF_SLUG - export VAULT_INTERNAL_HOSTNAME=$VAULT_HOSTNAME + export VAULT_INTERNAL_HOSTNAME=$VAULT_INTERNAL_HOSTNAME_DEV + export VAULT_HOSTNAME=$VAULT_HOSTNAME_DEV export VAULT_PORT=$VAULT_PORT export VAULT_ACCESS_TOKEN= @@ -1101,7 +1110,7 @@ delete_ocf_dev: # Only Common configuration of env apply to both mongo express components. REGISTER_HOSTNAME # -------------------------------------------------------------------------------------------------------------- EOF - sed -e "s/^[ ]*export VAULT_ACCESS_TOKEN=.*/export VAULT_ACCESS_TOKEN=$VAULT_ACCESS_TOKEN/" \ + sed -e "s/^[ ]*export VAULT_ACCESS_TOKEN=.*/export VAULT_ACCESS_TOKEN=$VAULT_ACCESS_TOKEN_DEV/" \ helm/scripts/envs/$NAMESPACE_DEV.template > helm/scripts/envs/$NAMESPACE_DEV.env fi diff --git a/capif/templates/cicd-deploy-release.gitlab-ci.yml b/capif/templates/cicd-deploy-release.gitlab-ci.yml index 8b3758f1c8b0591c29b09f0f88c1ba3f5f1ac046..1918ea1e7130556c92f4947997254d64b4df9e6b 100644 --- a/capif/templates/cicd-deploy-release.gitlab-ci.yml +++ b/capif/templates/cicd-deploy-release.gitlab-ci.yml @@ -182,21 +182,21 @@ deploy_ocf_prod: --set ocf-api-invocation-logs.image.tag=$CI_COMMIT_TAG \ --set ocf-api-invocation-logs.env.monitoring="true" \ --set ocf-api-invocation-logs.env.capifHostname=capif-prod.$DOMAIN_PROD \ - --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-api-invocation-logs.env.vaultPort=$VAULT_PORT \ --set ocf-api-invocation-logs.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-api-invoker-management.image.repository=$CI_REGISTRY/ocf/capif/$PATH_PROD/ocf-api-invoker-management-api \ --set ocf-api-invoker-management.image.tag=$CI_COMMIT_TAG \ --set ocf-api-invoker-management.env.monitoring="true" \ --set ocf-api-invoker-management.env.capifHostname=capif-prod.$DOMAIN_PROD \ - --set ocf-api-invoker-management.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-invoker-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --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/$PATH_PROD/ocf-api-provider-management-api \ --set ocf-api-provider-management.image.tag=$CI_COMMIT_TAG \ --set ocf-api-provider-management.env.monitoring="true" \ --set ocf-api-provider-management.env.capifHostname=capif-prod.$DOMAIN_PROD \ - --set ocf-api-provider-management.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-api-provider-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --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/$PATH_PROD/ocf-events-api \ @@ -210,13 +210,13 @@ deploy_ocf_prod: --set ocf-security.image.tag=$CI_COMMIT_TAG \ --set ocf-security.env.monitoring="true" \ --set ocf-security.env.capifHostname=capif-prod.$DOMAIN_PROD \ - --set ocf-security.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-security.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-security.env.vaultPort=$VAULT_PORT \ --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-register.image.repository=$CI_REGISTRY/ocf/capif/$PATH_PROD/register \ --set ocf-register.image.tag=$CI_COMMIT_TAG \ --set ocf-register.env.registerHostname=register-prod.$DOMAIN_PROD \ - --set ocf-register.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-register.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-register.env.vaultPort=$VAULT_PORT \ --set ocf-register.env.mongoHost=mongo-register \ @@ -239,7 +239,7 @@ deploy_ocf_prod: --set nginx.image.repository=$CI_REGISTRY/ocf/capif/$PATH_PROD/nginx \ --set nginx.image.tag=$CI_COMMIT_TAG \ --set nginx.env.capifHostname=capif-prod.$DOMAIN_PROD \ - --set nginx.env.vaultHostname=$VAULT_HOSTNAME \ + --set nginx.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set nginx.env.vaultPort=$VAULT_PORT \ --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set nginx.ingress.enabled=true \ @@ -248,7 +248,7 @@ deploy_ocf_prod: --set nginx.ingress.hosts[0].paths[0].pathType="Prefix" \ --set ocf-helper.image.repository=$CI_REGISTRY/ocf/capif/$PATH_PROD/helper \ --set ocf-helper.image.tag=$CI_COMMIT_TAG \ - --set ocf-helper.env.vaultHostname=$VAULT_HOSTNAME \ + --set ocf-helper.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME_PROD \ --set ocf-helper.env.vaultPort=$VAULT_PORT \ --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN_PROD \ --set ocf-helper.env.capifHostname=capif-prod.$DOMAIN_PROD \ @@ -316,7 +316,8 @@ deploy_ocf_prod: export BASE_DOCKER_REGISTRY=labs.etsi.org:5050/ocf/capif export CAPIF_DOCKER_REGISTRY=$CI_REGISTRY/ocf/capif/$PATH_PROD export CAPIF_IMAGE_TAG=$CI_COMMIT_TAG - export VAULT_INTERNAL_HOSTNAME=$VAULT_HOSTNAME + export VAULT_INTERNAL_HOSTNAME=$VAULT_INTERNAL_HOSTNAME_PROD + export VAULT_HOSTNAME=$VAULT_HOSTNAME_PROD export VAULT_PORT=$VAULT_PORT export VAULT_ACCESS_TOKEN=