diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml index 6ff2073a1b3347b4864e85a41331c34014a8f793..9c88d30420c81fc97727d33974b0a54516a2eaad 100644 --- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml +++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml @@ -122,19 +122,22 @@ deploy_ocf_dev: # when: never # - if: $CI_COMMIT_BRANCH script: - - helm version - - kubectl version --output=yaml - - echo "### setting kubeconfig###" - - kubectl cluster-info - - yq --version - - cat helm/capif/Chart.yaml - - yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/Chart.yaml - - cat helm/capif/Chart.yaml - - echo "### download dependencies###" - - helm dependency build helm/capif - - echo "### updating capif###" - - helm uninstall -n $NAMESPACE_DEV ocf-developer || true - - helm upgrade --install -n $NAMESPACE_DEV ocf-developer helm/capif/ --set nginx.nginx.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV --set nginx.nginx.env.registerHostname=register-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \ + - | + helm version + kubectl version --output=yaml + echo "### setting kubeconfig###" + kubectl cluster-info + yq --version + cat helm/capif/Chart.yaml + yq e -i ".appVersion = \"$IMAGE_TAG_DEV\"" helm/capif/Chart.yaml + cat helm/capif/Chart.yaml + echo "### download dependencies###" + helm dependency build helm/capif + echo "### updating capif###" + helm uninstall -n $NAMESPACE_DEV ocf-developer || true + helm upgrade --install -n $NAMESPACE_DEV ocf-developer helm/capif/ \ + --set nginx.nginx.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \ + --set nginx.nginx.env.registerHostname=register-$CI_ENVIRONMENT_SLUG.$DOMAIN_DEV \ --set monitoring.grafana.ingress.hosts[0].host="grafana-$CI_ENVIRONMENT_SLUG.$DOMAIN_PROD" \ --set monitoring.grafana.ingress.hosts[0].paths[0].path="/" \ --set monitoring.grafana.ingress.hosts[0].paths[0].pathType="Prefix" \ @@ -144,8 +147,7 @@ deploy_ocf_dev: --set parametersVault.env.vaultPort=$VAULT_PORT \ --set parametersVault.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ --set ingress.ip=10.43.107.132 \ - --wait --timeout=10m \ - --create-namespace + --wait --timeout=10m --create-namespace delete_ocf_dev: stage: delete_ocf_dev