From 9f7ace71949b1be6fb73ecb9ae4897fc51ba5e93 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Wed, 29 Oct 2025 13:18:06 +0100 Subject: [PATCH 1/4] Add new value to check completion of job --- helm/scripts/install_vault.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/scripts/install_vault.sh b/helm/scripts/install_vault.sh index 52dfbdf..c9fb249 100755 --- a/helm/scripts/install_vault.sh +++ b/helm/scripts/install_vault.sh @@ -132,7 +132,7 @@ while true; do if [ "$FAILED_JOB_STATUS" != "" ]; then echo "The vault job fails, check variables." exit -1 - elif [ "$SUCCEEDED_JOB_STATUS" != "" ] && (( SUCCEEDED_JOB_STATUS > 0 )) && [ "$COMPLETED_TYPE_JOB_STATUS" == "Complete" ] && [ "$COMPLETION_JOB_STATUS" == "True" ]; then + elif [ "$SUCCEEDED_JOB_STATUS" != "" ] && (( SUCCEEDED_JOB_STATUS > 0 )) && { [ "$COMPLETED_TYPE_JOB_STATUS" == "Complete" ] || [ "$COMPLETED_TYPE_JOB_STATUS" == "SuccessCriteriaMet" ]; } && [ "$COMPLETION_JOB_STATUS" == "True" ]; then echo "The vault job succeeded." break else -- GitLab From 87d1cc3ede4a608ed002ecb026e2dbe6f72153d6 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Thu, 30 Oct 2025 16:46:19 +0100 Subject: [PATCH 2/4] improve capif install script --- helm/capif/Chart.yaml | 47 +++-- helm/scripts/install_capif.sh | 322 +++++++++++++++++----------------- 2 files changed, 202 insertions(+), 167 deletions(-) diff --git a/helm/capif/Chart.yaml b/helm/capif/Chart.yaml index 8978586..d637e23 100644 --- a/helm/capif/Chart.yaml +++ b/helm/capif/Chart.yaml @@ -22,57 +22,84 @@ appVersion: "v3.1.6" dependencies: - name: ocf-access-control-policy version: "*" + tags: ["core"] - name: ocf-api-invoker-management version: "*" + tags: ["core"] - name: ocf-api-provider-management version: "*" + tags: ["core"] - name: ocf-api-invocation-logs version: "*" + tags: ["core"] - name: ocf-events version: "*" + tags: ["core"] - name: ocf-helper version: "*" + tags: ["core"] - name: ocf-routing-info version: "*" + tags: ["core"] - name: ocf-security version: "*" - - name: ocf-register - version: "*" - - name: mongo-register - version: "*" + tags: ["core"] - name: ocf-auditing-api-logs version: "*" + tags: ["core"] - name: ocf-publish-service-api version: "*" + tags: ["core"] - name: ocf-discover-service-api version: "*" - - name: mongo - version: "*" - - name: mongo-express - version: "*" - - name: mongo-register-express - version: "*" + tags: ["core"] - name: nginx version: "*" + tags: ["core"] - name: mock-server version: "*" + tags: ["core"] - name: redis version: "*" + tags: ["core"] - name: fluentbit version: "*" + tags: ["core"] - name: grafana version: "*" + tags: ["core"] - name: loki version: "*" + tags: ["core"] - name: otelcollector version: "*" + tags: ["core"] - name: renderer version: "*" + tags: ["core"] - name: celery-beat version: "*" + tags: ["core"] - name: celery-worker version: "*" + tags: ["core"] - name: "tempo" condition: tempo.enabled repository: "https://grafana.github.io/helm-charts" version: "^1.3.1" + tags: ["core"] + - name: ocf-register + version: "*" + tags: ["register"] + - name: mongo-register + version: "*" + tags: ["register-db"] + - name: mongo-register-express + version: "*" + tags: ["register-db"] + - name: mongo + version: "*" + tags: ["core-db"] + - name: mongo-express + version: "*" + tags: ["core-db"] diff --git a/helm/scripts/install_capif.sh b/helm/scripts/install_capif.sh index 803b59c..f65345d 100755 --- a/helm/scripts/install_capif.sh +++ b/helm/scripts/install_capif.sh @@ -18,160 +18,168 @@ helm $KUBECONFIG dependency build $HELM_DIR/capif/ ### check ingress_ip.oneke and get ip from ingress-nginx-controller kubectl $KUBECONFIG get svc -A | grep ingress-nginx-controller -helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART $HELM_DIR/capif/ \ ---set grafana.enabled=true \ ---set grafana.ingress.enabled=true \ ---set grafana.ingress.hosts[0].host=ocf-mon-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN \ ---set grafana.ingress.hosts[0].paths[0].path="/" \ ---set grafana.ingress.hosts[0].paths[0].pathType="Prefix" \ ---set grafana.env.prometheusUrl=$PROMETHEUS_URL \ ---set grafana.env.tempoUrl="http://$CAPIF_NAME_VERSION_CHART-tempo:3100" \ ---set grafana.persistence.storageClass=$CAPIF_STORAGE_CLASS \ ---set grafana.persistence.storage=$CAPIF_GRAFANA_STORAGE_SIZE \ ---set fluentbit.enabled=true \ ---set loki.enabled=true \ ---set loki.persistence.storageClass=$CAPIF_STORAGE_CLASS \ ---set loki.persistence.storage=$CAPIF_LOKI_STORAGE_SIZE \ ---set tempo.tempo.metricsGenerator.remoteWriteUrl=$PROMETHEUS_URL/api/v1/write \ ---set tempo.persistence.size=$CAPIF_TEMPO_STORAGE_SIZE \ ---set otelcollector.enabled=true \ ---set otelcollector.configMap.tempoEndpoint=$CAPIF_NAME_VERSION_CHART-tempo:4317 \ ---set ocf-access-control-policy.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-access-control-policy-api \ ---set ocf-access-control-policy.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-access-control-policy.image.env.capifHostname=$CAPIF_HOSTNAME \ ---set ocf-access-control-policy.monitoring="true" \ ---set ocf-access-control-policy.env.logLevel="$LOG_LEVEL" \ ---set ocf-api-invocation-logs.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-logging-api-invocation-api \ ---set ocf-api-invocation-logs.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-api-invocation-logs.env.monitoring="true" \ ---set ocf-api-invocation-logs.env.capifHostname=$CAPIF_HOSTNAME \ ---set ocf-api-invocation-logs.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ ---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.logLevel="$LOG_LEVEL" \ ---set ocf-api-invoker-management.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-api-invoker-management-api \ ---set ocf-api-invoker-management.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-api-invoker-management.env.monitoring="true" \ ---set ocf-api-invoker-management.env.capifHostname=$CAPIF_HOSTNAME \ ---set ocf-api-invoker-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ ---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.logLevel="$LOG_LEVEL" \ ---set ocf-api-provider-management.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-api-provider-management-api \ ---set ocf-api-provider-management.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-api-provider-management.env.monitoring="true" \ ---set ocf-api-provider-management.env.capifHostname=$CAPIF_HOSTNAME \ ---set ocf-api-provider-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ ---set ocf-api-provider-management.env.logLevel="$LOG_LEVEL" \ ---set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \ ---set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ ---set ocf-events.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-events-api \ ---set ocf-events.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-events.env.monitoring="true" \ ---set ocf-events.env.capifHostname=$CAPIF_HOSTNAME \ ---set ocf-events.env.logLevel="$LOG_LEVEL" \ ---set ocf-routing-info.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-routing-info-api \ ---set ocf-routing-info.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-routing-info.env.monitoring="true" \ ---set ocf-routing-info.env.logLevel="$LOG_LEVEL" \ ---set ocf-security.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-security-api \ ---set ocf-security.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-security.env.monitoring="true" \ ---set ocf-security.env.capifHostname=$CAPIF_HOSTNAME \ ---set ocf-security.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ ---set ocf-security.env.vaultPort=$VAULT_PORT \ ---set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ ---set ocf-security.env.logLevel="$LOG_LEVEL" \ ---set ocf-register.image.repository=$CAPIF_DOCKER_REGISTRY/register \ ---set ocf-register.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-register.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ ---set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ ---set ocf-register.env.vaultPort=$VAULT_PORT \ ---set ocf-register.env.mongoHost=mongo-register \ ---set ocf-register.env.mongoPort=27017 \ ---set ocf-register.env.capifHostname=$CAPIF_HOSTNAME \ ---set ocf-register.ingress.enabled=true \ ---set ocf-register.ingress.hosts[0].host=$REGISTER_HOSTNAME \ ---set ocf-register.ingress.hosts[0].paths[0].path="/" \ ---set ocf-register.ingress.hosts[0].paths[0].pathType="Prefix" \ ---set ocf-register.env.logLevel="$LOG_LEVEL" \ ---set ocf-register.extraConfigPod.hostAliases[0].hostnames[0]=$CAPIF_HOSTNAME \ ---set ocf-register.extraConfigPod.hostAliases[0].ip=$K8S_IP \ ---set ocf-auditing-api-logs.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-auditing-api \ ---set ocf-auditing-api-logs.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-auditing-api-logs.env.monitoring="true" \ ---set ocf-auditing-api-logs.env.logLevel="$LOG_LEVEL" \ ---set ocf-publish-service-api.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-publish-service-api \ ---set ocf-publish-service-api.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-publish-service-api.env.monitoring="true" \ ---set ocf-publish-service-api.env.capifHostname=$CAPIF_HOSTNAME \ ---set ocf-publish-service-api.env.logLevel="$LOG_LEVEL" \ ---set ocf-discover-service-api.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-discover-service-api \ ---set ocf-discover-service-api.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-discover-service-api.env.monitoring="true" \ ---set ocf-discover-service-api.env.logLevel="$LOG_LEVEL" \ ---set nginx.image.repository=$CAPIF_DOCKER_REGISTRY/nginx \ ---set nginx.image.tag=$CAPIF_IMAGE_TAG \ ---set nginx.env.capifHostname=$CAPIF_HOSTNAME \ ---set nginx.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ ---set nginx.env.vaultPort=$VAULT_PORT \ ---set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ ---set nginx.ingress.enabled=true \ ---set nginx.ingress.hosts[0].host=$CAPIF_HOSTNAME \ ---set nginx.ingress.hosts[0].paths[0].path="/" \ ---set nginx.ingress.hosts[0].paths[0].pathType="Prefix" \ ---set nginx.env.logLevel="$LOG_LEVEL" \ ---set ocf-helper.image.repository=$CAPIF_DOCKER_REGISTRY/helper \ ---set ocf-helper.image.tag=$CAPIF_IMAGE_TAG \ ---set ocf-helper.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ ---set ocf-helper.env.vaultPort=$VAULT_PORT \ ---set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ ---set ocf-helper.env.capifHostname=$CAPIF_HOSTNAME \ ---set ocf-helper.env.logLevel="$LOG_LEVEL" \ ---set mock-server.enabled=true \ ---set mock-server.image.repository=$CAPIF_DOCKER_REGISTRY/mock-server \ ---set mock-server.image.tag=$CAPIF_IMAGE_TAG \ ---set mock-server.ingress.enabled=true \ ---set mock-server.ingress.hosts[0].host=mock-server-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN \ ---set mock-server.ingress.hosts[0].paths[0].path="/" \ ---set mock-server.ingress.hosts[0].paths[0].pathType="Prefix" \ ---set mock-server.env.logLevel="$LOG_LEVEL" \ ---set mock-server.service.port=$MOCK_SERVER_PORT \ ---set mock-server.livenessProbe.tcpSocket.port=$MOCK_SERVER_PORT \ ---set mongo-register.image.repository=$BASE_DOCKER_REGISTRY/mongo \ ---set mongo-register.image.tag=6.0.2 \ ---set mongo-register.persistence.storageClass=$CAPIF_STORAGE_CLASS \ ---set mongo-register.persistence.storage=$CAPIF_MONGO_REGISTER_STORAGE_SIZE \ ---set mongo-register.extraFlags[0]="--repair" \ ---set mongo-register-express.enabled=true \ ---set mongo-register-express.ingress.enabled=true \ ---set mongo-register-express.ingress.hosts[0].host="mongo-express-register-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \ ---set mongo-register-express.ingress.hosts[0].paths[0].path="/" \ ---set mongo-register-express.ingress.hosts[0].paths[0].pathType="Prefix" \ ---set mongo.persistence.storageClass=$CAPIF_STORAGE_CLASS \ ---set mongo.persistence.storage=$CAPIF_MONGO_STORAGE_SIZE \ ---set mongo.extraFlags[0]="--repair" \ ---set mongo.image.repository=$BASE_DOCKER_REGISTRY/mongo \ ---set mongo.image.tag=6.0.2 \ ---set mongo.busybox.repository=$BASE_DOCKER_REGISTRY/busybox \ ---set mongo.busybox.tag=1.37.0 \ ---set mongo-express.enabled=true \ ---set mongo-express.ingress.enabled=true \ ---set mongo-express.ingress.hosts[0].host="mongo-express-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \ ---set mongo-express.ingress.hosts[0].paths[0].path="/" \ ---set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \ ---set redis.image.repository=$BASE_DOCKER_REGISTRY/redis \ ---set redis.image.tag=7.4.2-alpine \ ---set celery-beat.image.repository=$CAPIF_DOCKER_REGISTRY/celery \ ---set celery-beat.image.tag=$CAPIF_IMAGE_TAG \ ---set celery-beat.env.celeryModel=beat \ ---set celery-beat.env.redisHost=redis \ ---set celery-beat.env.redisPort=6379 \ ---set celery-beat.env.logLevel="$LOG_LEVEL" \ ---set celery-worker.image.repository=$CAPIF_DOCKER_REGISTRY/celery \ ---set celery-worker.image.tag=$CAPIF_IMAGE_TAG \ ---set celery-worker.env.celeryModel=worker \ ---set celery-worker.env.redisHost=redis \ ---set celery-worker.env.redisPort=6379 \ ---set celery-worker.env.logLevel="$LOG_LEVEL" \ ---wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG +install_capif_helm() { + local extra_args=("$@") + helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART $HELM_DIR/capif/ \ + --set grafana.enabled=true \ + --set grafana.ingress.enabled=true \ + --set grafana.ingress.hosts[0].host=ocf-mon-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN \ + --set grafana.ingress.hosts[0].paths[0].path="/" \ + --set grafana.ingress.hosts[0].paths[0].pathType="Prefix" \ + --set grafana.env.prometheusUrl=$PROMETHEUS_URL \ + --set grafana.env.tempoUrl="http://$CAPIF_NAME_VERSION_CHART-tempo:3100" \ + --set grafana.persistence.storageClass=$CAPIF_STORAGE_CLASS \ + --set grafana.persistence.storage=$CAPIF_GRAFANA_STORAGE_SIZE \ + --set fluentbit.enabled=true \ + --set loki.enabled=true \ + --set loki.persistence.storageClass=$CAPIF_STORAGE_CLASS \ + --set loki.persistence.storage=$CAPIF_LOKI_STORAGE_SIZE \ + --set tempo.tempo.metricsGenerator.remoteWriteUrl=$PROMETHEUS_URL/api/v1/write \ + --set tempo.persistence.size=$CAPIF_TEMPO_STORAGE_SIZE \ + --set otelcollector.enabled=true \ + --set otelcollector.configMap.tempoEndpoint=$CAPIF_NAME_VERSION_CHART-tempo:4317 \ + --set ocf-access-control-policy.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-access-control-policy-api \ + --set ocf-access-control-policy.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-access-control-policy.image.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-access-control-policy.monitoring="true" \ + --set ocf-access-control-policy.env.logLevel="$LOG_LEVEL" \ + --set ocf-api-invocation-logs.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-logging-api-invocation-api \ + --set ocf-api-invocation-logs.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-api-invocation-logs.env.monitoring="true" \ + --set ocf-api-invocation-logs.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-api-invocation-logs.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ + --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.logLevel="$LOG_LEVEL" \ + --set ocf-api-invoker-management.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-api-invoker-management-api \ + --set ocf-api-invoker-management.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-api-invoker-management.env.monitoring="true" \ + --set ocf-api-invoker-management.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-api-invoker-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ + --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.logLevel="$LOG_LEVEL" \ + --set ocf-api-provider-management.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-api-provider-management-api \ + --set ocf-api-provider-management.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-api-provider-management.env.monitoring="true" \ + --set ocf-api-provider-management.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-api-provider-management.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ + --set ocf-api-provider-management.env.logLevel="$LOG_LEVEL" \ + --set ocf-api-provider-management.env.vaultPort=$VAULT_PORT \ + --set ocf-api-provider-management.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-events.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-events-api \ + --set ocf-events.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-events.env.monitoring="true" \ + --set ocf-events.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-events.env.logLevel="$LOG_LEVEL" \ + --set ocf-routing-info.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-routing-info-api \ + --set ocf-routing-info.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-routing-info.env.monitoring="true" \ + --set ocf-routing-info.env.logLevel="$LOG_LEVEL" \ + --set ocf-security.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-security-api \ + --set ocf-security.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-security.env.monitoring="true" \ + --set ocf-security.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-security.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ + --set ocf-security.env.vaultPort=$VAULT_PORT \ + --set ocf-security.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-security.env.logLevel="$LOG_LEVEL" \ + --set ocf-register.image.repository=$CAPIF_DOCKER_REGISTRY/register \ + --set ocf-register.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-register.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ + --set ocf-register.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-register.env.vaultPort=$VAULT_PORT \ + --set ocf-register.env.mongoHost=mongo-register \ + --set ocf-register.env.mongoPort=27017 \ + --set ocf-register.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-register.ingress.enabled=true \ + --set ocf-register.ingress.hosts[0].host=$REGISTER_HOSTNAME \ + --set ocf-register.ingress.hosts[0].paths[0].path="/" \ + --set ocf-register.ingress.hosts[0].paths[0].pathType="Prefix" \ + --set ocf-register.env.logLevel="$LOG_LEVEL" \ + --set ocf-register.extraConfigPod.hostAliases[0].hostnames[0]=$CAPIF_HOSTNAME \ + --set ocf-register.extraConfigPod.hostAliases[0].ip=$K8S_IP \ + --set ocf-auditing-api-logs.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-auditing-api \ + --set ocf-auditing-api-logs.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-auditing-api-logs.env.monitoring="true" \ + --set ocf-auditing-api-logs.env.logLevel="$LOG_LEVEL" \ + --set ocf-publish-service-api.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-publish-service-api \ + --set ocf-publish-service-api.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-publish-service-api.env.monitoring="true" \ + --set ocf-publish-service-api.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-publish-service-api.env.logLevel="$LOG_LEVEL" \ + --set ocf-discover-service-api.image.repository=$CAPIF_DOCKER_REGISTRY/ocf-discover-service-api \ + --set ocf-discover-service-api.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-discover-service-api.env.monitoring="true" \ + --set ocf-discover-service-api.env.logLevel="$LOG_LEVEL" \ + --set nginx.image.repository=$CAPIF_DOCKER_REGISTRY/nginx \ + --set nginx.image.tag=$CAPIF_IMAGE_TAG \ + --set nginx.env.capifHostname=$CAPIF_HOSTNAME \ + --set nginx.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ + --set nginx.env.vaultPort=$VAULT_PORT \ + --set nginx.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set nginx.ingress.enabled=true \ + --set nginx.ingress.hosts[0].host=$CAPIF_HOSTNAME \ + --set nginx.ingress.hosts[0].paths[0].path="/" \ + --set nginx.ingress.hosts[0].paths[0].pathType="Prefix" \ + --set nginx.env.logLevel="$LOG_LEVEL" \ + --set ocf-helper.image.repository=$CAPIF_DOCKER_REGISTRY/helper \ + --set ocf-helper.image.tag=$CAPIF_IMAGE_TAG \ + --set ocf-helper.env.vaultHostname=$VAULT_INTERNAL_HOSTNAME \ + --set ocf-helper.env.vaultPort=$VAULT_PORT \ + --set ocf-helper.env.vaultAccessToken=$VAULT_ACCESS_TOKEN \ + --set ocf-helper.env.capifHostname=$CAPIF_HOSTNAME \ + --set ocf-helper.env.logLevel="$LOG_LEVEL" \ + --set mock-server.enabled=true \ + --set mock-server.image.repository=$CAPIF_DOCKER_REGISTRY/mock-server \ + --set mock-server.image.tag=$CAPIF_IMAGE_TAG \ + --set mock-server.ingress.enabled=true \ + --set mock-server.ingress.hosts[0].host=mock-server-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN \ + --set mock-server.ingress.hosts[0].paths[0].path="/" \ + --set mock-server.ingress.hosts[0].paths[0].pathType="Prefix" \ + --set mock-server.env.logLevel="$LOG_LEVEL" \ + --set mock-server.service.port=$MOCK_SERVER_PORT \ + --set mock-server.livenessProbe.tcpSocket.port=$MOCK_SERVER_PORT \ + --set mongo-register.image.repository=$BASE_DOCKER_REGISTRY/mongo \ + --set mongo-register.image.tag=6.0.2 \ + --set mongo-register.persistence.storageClass=$CAPIF_STORAGE_CLASS \ + --set mongo-register.persistence.storage=$CAPIF_MONGO_REGISTER_STORAGE_SIZE \ + --set mongo-register.extraFlags[0]="--repair" \ + --set mongo-register-express.enabled=true \ + --set mongo-register-express.ingress.enabled=true \ + --set mongo-register-express.ingress.hosts[0].host="mongo-express-register-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \ + --set mongo-register-express.ingress.hosts[0].paths[0].path="/" \ + --set mongo-register-express.ingress.hosts[0].paths[0].pathType="Prefix" \ + --set mongo.persistence.storageClass=$CAPIF_STORAGE_CLASS \ + --set mongo.persistence.storage=$CAPIF_MONGO_STORAGE_SIZE \ + --set mongo.extraFlags[0]="--repair" \ + --set mongo.image.repository=$BASE_DOCKER_REGISTRY/mongo \ + --set mongo.image.tag=6.0.2 \ + --set mongo.busybox.repository=$BASE_DOCKER_REGISTRY/busybox \ + --set mongo.busybox.tag=1.37.0 \ + --set mongo-express.enabled=true \ + --set mongo-express.ingress.enabled=true \ + --set mongo-express.ingress.hosts[0].host="mongo-express-$CAPIF_CI_ENV_ENDPOINT.$CAPIF_DOMAIN" \ + --set mongo-express.ingress.hosts[0].paths[0].path="/" \ + --set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \ + --set redis.image.repository=$BASE_DOCKER_REGISTRY/redis \ + --set redis.image.tag=7.4.2-alpine \ + --set celery-beat.image.repository=$CAPIF_DOCKER_REGISTRY/celery \ + --set celery-beat.image.tag=$CAPIF_IMAGE_TAG \ + --set celery-beat.env.celeryModel=beat \ + --set celery-beat.env.redisHost=redis \ + --set celery-beat.env.redisPort=6379 \ + --set celery-beat.env.logLevel="$LOG_LEVEL" \ + --set celery-worker.image.repository=$CAPIF_DOCKER_REGISTRY/celery \ + --set celery-worker.image.tag=$CAPIF_IMAGE_TAG \ + --set celery-worker.env.celeryModel=worker \ + --set celery-worker.env.redisHost=redis \ + --set celery-worker.env.redisPort=6379 \ + --set celery-worker.env.logLevel="$LOG_LEVEL" \ + --wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG "${extra_args[@]}" +} + +install_capif_helm --set tags.register-db=true --set tags.register=false --set tags.core=false --set tags.core-db=false +install_capif_helm --set tags.register-db=false --set tags.register=false --set tags.core=false --set tags.core-db=true +install_capif_helm --set tags.register-db=false --set tags.register=false --set tags.core=true --set tags.core-db=false +install_capif_helm --set tags.register-db=false --set tags.register=true --set tags.core=false --set tags.core-db=false \ No newline at end of file -- GitLab From 648adb07ed6b75e056eadd90e478f8861d038954 Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 3 Nov 2025 11:27:31 +0100 Subject: [PATCH 3/4] Setup default values for deployed tags on capif helm chart --- helm/capif/values.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/helm/capif/values.yaml b/helm/capif/values.yaml index 9ecc11e..dfd4a6b 100644 --- a/helm/capif/values.yaml +++ b/helm/capif/values.yaml @@ -3,6 +3,12 @@ # -- tempo, fluentbit, grafana, loki, otelcollector and renderer. # -- prometheus service must be previously installed in kubernetes +tags: + core: true + core-db: true + register: true + register-db: true + # -- With tempo.enabled: false. It won't be deployed tempo: enabled: true -- GitLab From 209309348311f700828cdf53e0fed296d461f46e Mon Sep 17 00:00:00 2001 From: Jorge Moratinos Salcines Date: Mon, 3 Nov 2025 16:50:12 +0100 Subject: [PATCH 4/4] Improved install helm script --- helm/scripts/install_capif.sh | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/helm/scripts/install_capif.sh b/helm/scripts/install_capif.sh index f65345d..f4222ed 100755 --- a/helm/scripts/install_capif.sh +++ b/helm/scripts/install_capif.sh @@ -179,7 +179,4 @@ install_capif_helm() { --wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG "${extra_args[@]}" } -install_capif_helm --set tags.register-db=true --set tags.register=false --set tags.core=false --set tags.core-db=false -install_capif_helm --set tags.register-db=false --set tags.register=false --set tags.core=false --set tags.core-db=true -install_capif_helm --set tags.register-db=false --set tags.register=false --set tags.core=true --set tags.core-db=false -install_capif_helm --set tags.register-db=false --set tags.register=true --set tags.core=false --set tags.core-db=false \ No newline at end of file +install_capif_helm --set tags.register-db=true --set tags.register=true --set tags.core=true --set tags.core-db=true -- GitLab