From bc363dbe164c12341720a19c420e140ff23d6b53 Mon Sep 17 00:00:00 2001
From: Conor Brady <con.brad@gmail.com>
Date: Thu, 11 Jul 2024 09:43:26 -0700
Subject: [PATCH] Label pruner job for deletion, bump dev crunchydb pvc size

---
 .github/workflows/deployment.yml                       | 4 ++--
 .vscode/settings.json                                  | 1 +
 openshift/scripts/oc_provision_hourly_prune_cronjob.sh | 1 +
 openshift/templates/prune_hourlies_cronjob.yaml        | 4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
index add0f4519..9dc919dcf 100644
--- a/.github/workflows/deployment.yml
+++ b/.github/workflows/deployment.yml
@@ -22,7 +22,7 @@ jobs:
         shell: bash
         run: |
           oc login "${{ secrets.OPENSHIFT_CLUSTER }}" --token="${{ secrets.OC4_DEV_TOKEN }}"
-          EPHEMERAL_STORAGE=True BUCKET=gpdqha DATA_SIZE=1Gi WAL_SIZE=1Gi bash openshift/scripts/oc_provision_crunchy.sh ${SUFFIX} apply
+          EPHEMERAL_STORAGE=True BUCKET=gpdqha DATA_SIZE=5Gi WAL_SIZE=5Gi bash openshift/scripts/oc_provision_crunchy.sh ${SUFFIX} apply
 
   build-web-image:
     # Declared ahead of build-api-image ; it runs slightly slower than the api build, and putting
@@ -200,7 +200,7 @@ jobs:
         run: |
           oc login "${{ secrets.OPENSHIFT_CLUSTER }}" --token="${{ secrets.OC4_DEV_TOKEN }}"
           PROJ_DEV="e1e498-dev" bash openshift/scripts/oc_provision_grass_curing_cronjob.sh ${SUFFIX} apply
-      
+
       - name: RDPS SFMS cronjob
         shell: bash
         run: |
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 9c3cebf5f..2839b068f 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -62,6 +62,7 @@
         "GDPS",
         "grib",
         "gribs",
+        "hourlies",
         "HRDPS",
         "ndarray",
         "numba",
diff --git a/openshift/scripts/oc_provision_hourly_prune_cronjob.sh b/openshift/scripts/oc_provision_hourly_prune_cronjob.sh
index 213a268ad..f2c7f9205 100755
--- a/openshift/scripts/oc_provision_hourly_prune_cronjob.sh
+++ b/openshift/scripts/oc_provision_hourly_prune_cronjob.sh
@@ -31,6 +31,7 @@ SCHEDULE="${SCHEDULE:-0 2 * * *}"
 # Process template
 OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/prune_hourlies_cronjob.yaml \
 -p SUFFIX=${SUFFIX} \
+-p APP_LABEL=${APP_NAME}-${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"}"
 
diff --git a/openshift/templates/prune_hourlies_cronjob.yaml b/openshift/templates/prune_hourlies_cronjob.yaml
index 72915819f..b7a5f4d49 100644
--- a/openshift/templates/prune_hourlies_cronjob.yaml
+++ b/openshift/templates/prune_hourlies_cronjob.yaml
@@ -19,6 +19,8 @@ parameters:
     description: "The TAG name for this environment, e.g., dev, test, prod"
     required: true
     value: "prod"
+  - name: APP_LABEL
+    required: true
 objects:
   - kind: CronJob
     apiVersion: batch/v1
@@ -35,7 +37,7 @@ objects:
         metadata:
           labels:
             cronjob: prune-hourlies-${NAME}-${SUFFIX}
-            app: prune-hourlies-${NAME}-${SUFFIX}
+            app: ${APP_LABEL}
         spec:
           template:
             spec: