Improve storage calcs script add update to support oc 3.9.

uselagoon · Nov 18, 2019 · 2a3fb9d · 2a3fb9d
1 parent 4e69f2d
commit 2a3fb9d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/images/oc/Dockerfile b/images/oc/Dockerfile
@@ -33,9 +33,9 @@ ENV TMPDIR=/tmp \
     BASH_ENV=/home/.bashrc
 
 # Defining Versions
-ENV OC_VERSION=v3.7.2 \
-    OC_HASH=282e43f \
-    OC_SHA256=abc89f025524eb205e433622e59843b09d2304cc913534c4ed8af627da238624 \
+ENV OC_VERSION=v3.9.0 \
+  OC_HASH=191fece \
+  OC_SHA256=6ed2fb1579b14b4557e4450a807c97cd1b68a6c727cd1e12deedc5512907222e \
     GLIBC_VERSION=2.28-r0
 
 # To run the openshift client library `oc` we need glibc, install that first. Copied from https://github.com/jeanblanchard/docker-alpine-glibc/blob/master/Dockerfile

diff --git a/services/storage-calculator/calculate-storage.sh b/services/storage-calculator/calculate-storage.sh
@@ -61,19 +61,31 @@ do
       fi
 
       OC="oc --insecure-skip-tls-verify --token=$OPENSHIFT_TOKEN --server=$OPENSHIFT_URL -n $ENVIRONMENT_OPENSHIFT_PROJECTNAME"
+
+      # Skip if namespace doesn't exist.
+      if ! ${OC} get ns ${ENVIRONMENT_OPENSHIFT_PROJECTNAME} >/dev/null 2>&1 ; then
+        echo "$OPENSHIFT_URL - $PROJECT_NAME - $ENVIRONMENT_NAME: no valid namespace found"
+        continue
+      fi
+
       echo "$OPENSHIFT_URL - $PROJECT_NAME - $ENVIRONMENT_NAME: creating storage-calc pod"
 
-      ${OC} run --image amazeeio/alpine-mysql-client storage-calc -- sh -c "while sleep 3600; do :; done"
+      # Cleanup any existing storage-calc deployments
+      ${OC} delete deploymentconfig/storage-calc >/dev/null 2>&1
+
+      # Start storage-calc deployment
+      ${OC} run --generator=deploymentconfig/v1 --image amazeeio/alpine-mysql-client storage-calc -- sh -c "while sleep 3600; do :; done"
       ${OC} rollout pause deploymentconfig/storage-calc
 
-      ${OC} env --from=configmap/lagoon-env deploymentconfig/storage-calc
+      # Copy environment variable from lagoon-env configmap.
+      ${OC} set env --from=configmap/lagoon-env deploymentconfig/storage-calc
 
       PVCS=($(${OC} get pvc -o name | sed 's/persistentvolumeclaims\///'))
 
       for PVC in "${PVCS[@]}"
       do
         echo "$OPENSHIFT_URL - $PROJECT_NAME - $ENVIRONMENT_NAME: mounting ${PVC} into storage-calc"
-        ${OC} volume deploymentconfig/storage-calc --add --name=${PVC} --type=persistentVolumeClaim --claim-name=${PVC} --mount-path=/storage/${PVC}
+        ${OC} set volume deploymentconfig/storage-calc --add --name=${PVC} --type=persistentVolumeClaim --claim-name=${PVC} --mount-path=/storage/${PVC}
       done
 
       ${OC} rollout resume deploymentconfig/storage-calc
@@ -84,6 +96,8 @@ do
 
       if [[ ! $POD ]]; then
         echo "No running pod found for storage-calc"
+        # Clean up any failed deployments.
+        ${OC} delete deploymentconfig/storage-calc >/dev/null 2>&1
         exit 1
       fi