From f9e7936cb1188d35e3a381e9de207c0a635024b4 Mon Sep 17 00:00:00 2001
From: andresanaya21 <alvaroandres.anayaamariles@telefonica.com>
Date: Wed, 5 Jun 2024 16:56:38 +0200
Subject: [PATCH] access-control-policy
---
capif/templates/cd-deploy-ocf.gitlab-ci.yml | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
index d1cf45d..bb82686 100644
--- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml
+++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml
@@ -73,8 +73,10 @@ deploy_ocf_staging:
--set parametersVault.env.vaultPort=$VAULT_PORT \
--set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
--set ingress.ip=10.43.107.132 \
- --set accessControlPolicy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
- --set accessControlPolicy.image.tag=$CI_COMMIT_REF_SLUG \
+ --set access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
+ --set access-control-policy.image.tag=$CI_COMMIT_REF_SLUG \
+ --set access-control-policy.image.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \
+ --set access-control-policy.env.monitoring="true" \
--set apiInvocationLogs.apiInvocationLogs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api \
--set apiInvocationLogs.apiInvocationLogs.image.tag=$CI_COMMIT_REF_SLUG \
--set apiInvokerManagement.apiInvokerManagement.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api \
@@ -159,8 +161,10 @@ deploy_ocf_oficial_staging:
--set parametersVault.env.vaultPort=$VAULT_PORT \
--set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
--set ingress.ip=10.43.107.132 \
- --set accessControlPolicy.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api \
- --set accessControlPolicy.image.tag=staging \
+ --set access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-access-control-policy-api \
+ --set access-control-policy.image.tag=staging \
+ --set access-control-policy.image.env.capifHostname=capif-staging.$DOMAIN_STAGING \
+ --set access-control-policy.env.monitoring="true" \
--set apiInvocationLogs.apiInvocationLogs.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-logging-api-invocation-api \
--set apiInvocationLogs.apiInvocationLogs.image.tag=staging \
--set apiInvokerManagement.apiInvokerManagement.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-api-invoker-management-api \
@@ -238,8 +242,10 @@ deploy_ocf_dev:
--set parametersVault.env.vaultPort=$VAULT_PORT \
--set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \
--set ingress.ip=10.43.107.132 \
- --set accessControlPolicy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
- --set accessControlPolicy.image.tag=$CI_COMMIT_REF_SLUG \
+ --set access-control-policy.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-access-control-policy-api \
+ --set access-control-policy.image.tag=$CI_COMMIT_REF_SLUG \
+ --set access-control-policy.image.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \
+ --set access-control-policy.env.monitoring="true" \
--set apiInvocationLogs.apiInvocationLogs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-logging-api-invocation-api \
--set apiInvocationLogs.apiInvocationLogs.image.tag=$CI_COMMIT_REF_SLUG \
--set apiInvokerManagement.apiInvokerManagement.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-invoker-management-api \
--
GitLab