Ocf180 fix helm install script for vault MINOR FIX

Jorge Moratinosrequested to merge
OCF180-fix-helm-install-script-for-vault-2 into staging

Proposers

  • Jorge Moratinos Salcines (Telefónica)

Description

This MR will include minimal changes needed to install scripts to deploy successfully with new version of k8s cluster.

Acknowledgements

This work is funded by the European Commission through the HORIZON-JU-SNS-2022 6G-SANDBOX project with Grant Agreement number 101096328.

Merge request reports

helm/capif/Chart.yaml

+38 −10
Changes for helm/capif/Chart.yaml: 38 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -22,57 +22,85 @@ 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"]

helm/capif/values.yaml

+6 −0
Changes for helm/capif/values.yaml: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -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

helm/scripts/install_capif.sh

+6 −1
Changes for helm/scripts/install_capif.sh: 6 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 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



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 \
@@ -174,4 +176,7 @@ helm $KUBECONFIG upgrade --install -n $CAPIF_NAMESPACE $CAPIF_NAME_VERSION_CHART 
    --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
 
    --wait --timeout=10m --create-namespace --atomic $CAPIF_RESOURCES_RESERVE $CAPIF_STORAGE_ACCESS_MODE $CAPIF_RUN_AS_USER_CONFIG "${extra_args[@]}"

}



install_capif_helm

helm/scripts/install_vault.sh

+1 −1
Changes for helm/scripts/install_vault.sh: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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