Fix elif in create_pvc.sh

.gitlab-ci.yml

@@ -68,7 +68,7 @@ create geotiff storage:
     # copy secret kubeconfig to the mounted (pwd) directory
     - cp $kubekorner_k3s_config .
     - kubeconfig=$(basename $kubekorner_k3s_config)
-    - ./helpers/create_pvc.sh $ns production/geotiff-pvc.yaml $kubeconfig
+    - ./helpers/create_pvc.sh "$ns" "production/geotiff-pvc.yaml" "$kubeconfig"
   rules:
     - changes:
         - production/geotiff-pvc.yaml

helpers/create_pvc.sh

@@ -3,12 +3,12 @@
 if [[ $# -eq 2 ]]; then
     ns=$1
     pvc=$2
-    EXTRA_ARGS=""
-else if [[ $# -eq 3 ]]; then
+    EXTRA_ARGS="--namespace $ns"
+elif [[ $# -eq 3 ]]; then
     ns=$1
     pvc=$2
     kubeconfig=$3
-    EXTRA_ARGS="--kubeconfig $kubeconfig"
+    EXTRA_ARGS="--namespace $ns --kubeconfig $kubeconfig"
 else
     echo "Usage: ./create_pvc.sh <kubernetes namespace> <PVC YAML definition> <kubernetes config file>"
     exit 1
@@ -19,7 +19,7 @@ fi
 # didn't change. Let's make sure it exists on the cluster and if so, don't
 # try to recreate it.
 if [[ $CI_PIPELINE_SOURCE == "pipeline" ]]; then
-    pvc_exists=$(kubectl $EXTRA_ARGS get pvc --namespace $ns $pvc -o jsonpath="{.metadata.name}" || echo "")
+    pvc_exists=$(kubectl $EXTRA_ARGS get pvc $pvc -o jsonpath="{.metadata.name}" || echo "")
     if [[ "$pvc_exists" != "" ]]; then
         # it exists
         exit 0
@@ -27,4 +27,3 @@ if [[ $CI_PIPELINE_SOURCE == "pipeline" ]]; then
 fi
 
 kubectl $EXTRA_ARGS apply -f $pvc
-