diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml index c707fa9296264ffe7b8590b4149167b66e82ca49..ebc2f69cfa719f9bffd7b0321461c54904ddb49a 100644 --- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml +++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml @@ -56,6 +56,9 @@ deploy_ocf_staging: cat helm/capif/Chart.yaml yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" helm/capif/Chart.yaml cat helm/capif/Chart.yaml + ### Chart helper### + yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/helper/Chart.yaml + cat helm/capif/charts/helper/Chart.yaml echo "### download dependencies###" helm dependency build helm/capif echo "### updating capif###" @@ -95,7 +98,14 @@ deploy_ocf_staging: --set serviceApis.serviceApis.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-discover-service-api \ --set serviceApis.serviceApis.image.tag=$CI_COMMIT_REF_SLUG \ --set nginx.nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \ - --set nginx.nginx.image.tag=$CI_COMMIT_REF_SLUG --wait --timeout=10m --create-namespace --atomic + --set nginx.nginx.image.tag=$CI_COMMIT_REF_SLUG \ + --set helper.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/helper \ + --set helper.image.tag=$CI_COMMIT_REF_SLUG\ + --set helper.env.vaultHostname=$VAULT_HOSTNAME \ + --set helper.env.vaultPort=$VAULT_PORT \ + --set helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set helper.env.capifHostname=capif-$CI_COMMIT_REF_SLUG.$DOMAIN_STAGING \ + --wait --timeout=10m --create-namespace --atomic delete_ocf_staging: stage: delete_ocf_staging @@ -132,6 +142,9 @@ deploy_ocf_oficial_staging: cat helm/capif/Chart.yaml yq e -i ".appVersion = \"staging\"" helm/capif/Chart.yaml cat helm/capif/Chart.yaml + ### Chart helper### + yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/charts/helper/Chart.yaml + cat helm/capif/charts/helper/Chart.yaml echo "### download dependencies###" helm dependency build helm/capif echo "### updating capif###" @@ -171,7 +184,14 @@ deploy_ocf_oficial_staging: --set serviceApis.serviceApis.image.repository=$CI_REGISTRY/ocf/capif/staging/ocf-discover-service-api \ --set serviceApis.serviceApis.image.tag=staging \ --set nginx.nginx.image.repository=$CI_REGISTRY/ocf/capif/staging/nginx \ - --set nginx.nginx.image.tag=staging --wait --timeout=10m --create-namespace + --set nginx.nginx.image.tag=staging \ + --set helper.image.repository=$CI_REGISTRY/ocf/capif/staging/helper \ + --set helper.image.tag=staging\ + --set helper.env.vaultHostname=$VAULT_HOSTNAME \ + --set helper.env.vaultPort=$VAULT_PORT \ + --set helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set helper.env.capifHostname=capif-staging.$DOMAIN_STAGING \ + --wait --timeout=10m --create-namespace ## dev ### deploy_ocf_dev: