diff --git a/capif/templates/cd-deploy-ocf.gitlab-ci.yml b/capif/templates/cd-deploy-ocf.gitlab-ci.yml index bb9675a96431035c8528a0c1c396f5ffdb4afe20..664c8f33f7b10c15908f1b999a0177d3551e8617 100644 --- a/capif/templates/cd-deploy-ocf.gitlab-ci.yml +++ b/capif/templates/cd-deploy-ocf.gitlab-ci.yml @@ -75,24 +75,44 @@ deploy_ocf_staging: - cat helm/capif/Chart.yaml - echo "### download dependencies###" - helm dependency build helm/capif - - echo "### updating capif###" -# - helm uninstall -n $NAMESPACE_STAGING ocf-staging || true -# - helm upgrade --install -n $NAMESPACE_STAGING ocf-staging helm/capif/ \ -# --set nginx.nginx.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_STAGING \ -# --set nginx.nginx.env.registerHostname=register-$CI_ENVIRONMENT_SLUG.$DOMAIN_STAGING \ -# --set monitoring.prometheus.enable="" \ -# --set monitoring.grafana.ingress.hosts[0].host="grafana-$CI_ENVIRONMENT_SLUG.$DOMAIN_STAGING" \ -# --set monitoring.grafana.ingress.hosts[0].paths[0].path="/" \ -# --set monitoring.grafana.ingress.hosts[0].paths[0].pathType="Prefix" \ -# --set monitoring.grafana.env.prometheusURL=http://prometheus.ocf.pre-production \ -# --set tempo.tempo.metricsGenerator.remoteWriteUrl=http://prometheus.ocf.pre-production/api/v1/write \ -# --set parametersVault.env.vaultHostname=$VAULT_HOSTNAME \ -# --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 --atomic - + echo "### updating capif###" + helm upgrade --install -n NAMESPACE_DEV ocf-staging helm/capif/ --set nginx.nginx.env.capifHostname=capif-$CI_ENVIRONMENT_SLUG.$DOMAIN_STAGING \ + --set nginx.nginx.env.registerHostname=register-$CI_ENVIRONMENT_SLUG.$DOMAIN_STAGING \ + --set monitoring.grafana.ingress.hosts[0].host="grafana-$CI_ENVIRONMENT_SLUG.$DOMAIN_STAGING" \ + --set monitoring.grafana.ingress.hosts[0].paths[0].path="/" \ + --set monitoring.grafana.ingress.hosts[0].paths[0].pathType="Prefix" \ + --set monitoring.grafana.env.prometheusURL=http://prometheus.ocf.pre-production \ + --set tempo.tempo.metricsGenerator.remoteWriteUrl=http://prometheus.ocf.pre-production/api/v1/write \ + --set parametersVault.env.vaultHostname=$VAULT_HOSTNAME \ + --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 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 \ + --set apiInvokerManagement.apiInvokerManagement.image.tag=$CI_COMMIT_REF_SLUG \ + --set apiProviderManagement.apiProviderManagement.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-api-provider-management-api \ + --set apiProviderManagement.apiProviderManagement.image.tag=$CI_COMMIT_REF_SLUG \ + --set capifEvents.capifEvents.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-events-api \ + --set capifEvents.capifEvents.image.tag=$CI_COMMIT_REF_SLUG \ + --set capifRoutingInfo.capifRoutingInfo.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-routing-info-api \ + --set capifRoutingInfo.capifRoutingInfo.image.tag=$CI_COMMIT_REF_SLUG \ + --set capifSecurity.capifSecurity.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-security-api \ + --set capifSecurity.capifSecurity.image.tag=$CI_COMMIT_REF_SLUG \ + --set register.register.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/register \ + --set register.register.image.tag=$CI_COMMIT_REF_SLUG \ + --set logs.logs.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-auditing-api \ + --set logs.logs.image.tag=$CI_COMMIT_REF_SLUG \ + --set nignx.nginx.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/nginx \ + --set nignx.nginx.image.tag=$CI_COMMIT_REF_SLUG \ + --set publishedApis.publishedApis.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/ocf-publish-service-api \ + --set publishedApis.publishedApis.image.tag=$CI_COMMIT_REF_SLUG \ + --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 delete_ocf_staging: stage: delete_ocf_staging @@ -178,7 +198,7 @@ delete_ocf_dev: <<: *staging_common script: - echo "### deleting environment $NAMESPACE_DEV###" -# - helm uninstall -n $NAMESPACE_DEV ocf-dev + - helm uninstall -n $NAMESPACE_DEV ocf-developer when: manual environment: name: review/$CI_COMMIT_REF_SLUG