Commit 123a5128 authored by Jorge Moratinos's avatar Jorge Moratinos
Browse files

Fix install vault script according to new k8s verstion contants

parent 7091ec4c

helm/scripts/install_capif.sh

+162 −157
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
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