Commit 20f013d9 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Helm scripts and helm charts upgraded

parent cdb43f1c

helm/capif/charts/mongo/templates/deployment.yaml

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ spec: 
            {{- toYaml . | nindent 12 }}

          {{- end }}

        - name: mongo-helper

          image: busybox

          image: "{{ .Values.busybox.repository }}:{{ .Values.busybox.tag | default .Chart.AppVersion }}"

          command:

            - sh

            - -c

helm/capif/charts/mongo/values.yaml

+6 −0
Original line number Diff line number Diff line
@@ -10,6 +10,12 @@ image: 
  # Overrides the image tag whose default is the chart appVersion.

  tag: "6.0.2"



busybox:

  repository: busybox

  pullPolicy: Always

  # Overrides the image tag whose default is the chart appVersion.

  tag: "1.37.0"



imagePullSecrets: []

nameOverride: ""

fullnameOverride: ""

helm/scripts/install_capif.sh

+34 −14
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
--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="DEBUG" \

--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" \
@@ -39,7 +39,7 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
--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="DEBUG" \

--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" \
@@ -47,24 +47,24 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
--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="DEBUG" \

--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="DEBUG" \

--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="DEBUG" \

--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="DEBUG" \

--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" \
@@ -72,7 +72,7 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
--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="DEBUG" \

--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 \
@@ -85,22 +85,22 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
--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="DEBUG" \

--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="DEBUG" \

--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="DEBUG" \

--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="DEBUG" \

--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 \
@@ -111,14 +111,14 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
--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="debug" \

--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="DEBUG" \

--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 \
@@ -126,9 +126,11 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
--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="DEBUG" \

--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" \
@@ -140,9 +142,27 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
--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

helm/scripts/install_monitoring.sh

+10 −2
Original line number Diff line number Diff line
@@ -7,13 +7,21 @@ helm repo add grafana https://grafana.github.io/helm-charts 
helm $KUBECONFIG dependency build $HELM_DIR/monitoring-stack/



helm $KUBECONFIG upgrade --install -n $MONITORING_NAMESPACE $MONITORING_SERVICE_NAME $HELM_DIR/monitoring-stack/ \

--set grafana.enabled=false \

--set grafana.enabled=$MONITORING_GRAFANA_ENABLED \

--set grafana.env.prometheusUrl=$PROMETHEUS_URL \

--set prometheus.enabled=true \

--set grafana.ingress.enabled=true \

--set grafana.ingress.hosts[0].host=$GRAFANA_HOSTNAME \

--set grafana.ingress.hosts[0].paths[0].path="/" \

--set grafana.ingress.hosts[0].paths[0].pathType="Prefix" \

--set prometheus.enabled=$MONITORING_PROMETHEUS_ENABLED \

--set prometheus.ingress.enabled=true \

--set prometheus.ingress.hosts[0].host=$PROMETHEUS_HOSTNAME \

--set prometheus.ingress.hosts[0].paths[0].path="/" \

--set prometheus.ingress.hosts[0].paths[0].pathType="Prefix" \

--set skooner.enabled=$MONITORING_SNOOKER_ENABLED \

--set skooner.ingress.enabled=true \

--set skooner.ingress.hosts[0].host=$SKOONER_HOSTNAME \

--set skooner.ingress.hosts[0].paths[0].path="/" \

--set skooner.ingress.hosts[0].paths[0].pathType="Prefix" \

--wait --timeout=10m --create-namespace --atomic

helm/scripts/run_remote_capif_tests.sh

+3 −1
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ echo "CAPIF_VAULT_PORT = $VAULT_PORT" 
echo "CAPIF_VAULT_TOKEN = $VAULT_ACCESS_TOKEN"

echo "MOCK_SERVER_URL = $MOCK_SERVER_URL"

echo "DOCKER_ROBOT_IMAGE = $DOCKER_ROBOT_IMAGE:$DOCKER_ROBOT_IMAGE_VERSION"

echo "REGISTER_ADMIN_PASSWORD = $REGISTER_ADMIN_PASSWORD"



INPUT_OPTIONS=$@

# Check if input is provided
@@ -83,4 +84,5 @@ docker run -ti --rm --network="host" \ 
    --variable CAPIF_VAULT_PORT:$CAPIF_VAULT_PORT \

    --variable CAPIF_VAULT_TOKEN:$CAPIF_VAULT_TOKEN \

    --variable NOTIFICATION_DESTINATION_URL:$NOTIFICATION_DESTINATION_URL \

    --variable MOCK_SERVER_URL:$MOCK_SERVER_URL $INPUT_OPTIONS
 
    --variable MOCK_SERVER_URL:$MOCK_SERVER_URL \

    --variable REGISTER_ADMIN_PASSWORD:$REGISTER_ADMIN_PASSWORD $INPUT_OPTIONS