From 18800ad19913d47efcda1d0bf1a27da9da790e31 Mon Sep 17 00:00:00 2001
From: Darren Boss <darren.boss@gov.bc.ca>
Date: Sat, 16 Nov 2024 17:46:18 -0800
Subject: [PATCH 1/2] pg16 upgrade

---
 openshift/scripts/oc_deploy.sh                              | 4 ++--
 .../scripts/oc_provision_backup_s3_postgres_cronjob.sh      | 2 +-
 openshift/scripts/oc_provision_c_haines_cronjob.sh          | 2 +-
 openshift/scripts/oc_provision_ec_gdps_cronjob.sh           | 2 +-
 openshift/scripts/oc_provision_ec_hrdps_cronjob.sh          | 2 +-
 openshift/scripts/oc_provision_ec_rdps_cronjob.sh           | 2 +-
 openshift/scripts/oc_provision_grass_curing_cronjob.sh      | 2 +-
 openshift/scripts/oc_provision_nats.sh                      | 2 +-
 openshift/scripts/oc_provision_noaa_gfs_cronjob.sh          | 2 +-
 openshift/scripts/oc_provision_noaa_nam_cronjob.sh          | 2 +-
 openshift/scripts/oc_provision_rdps_sfms_cronjob.sh         | 2 +-
 openshift/scripts/oc_provision_viirs_snow_cronjob.sh        | 2 +-
 .../scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh     | 2 +-
 .../scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh     | 2 +-
 openshift/templates/crunchy.yaml                            | 6 +++---
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/openshift/scripts/oc_deploy.sh b/openshift/scripts/oc_deploy.sh
index 29e7a7183..f974f95d9 100755
--- a/openshift/scripts/oc_deploy.sh
+++ b/openshift/scripts/oc_deploy.sh
@@ -34,9 +34,9 @@ OBJ_NAME="${APP_NAME}-${SUFFIX}"
 OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${PATH_DEPLOY} \
  -p SUFFIX=${SUFFIX} \
  -p PROJECT_NAMESPACE=${PROJ_TARGET} \
- -p POSTGRES_USER=wps-crunchydb-${SUFFIX} \
+ -p POSTGRES_USER=wps-crunchydb-pg16-${SUFFIX} \
  -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
- -p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+ -p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
  -p VANITY_DOMAIN=${VANITY_DOMAIN} \
  ${SECOND_LEVEL_DOMAIN:+ "-p SECOND_LEVEL_DOMAIN=${SECOND_LEVEL_DOMAIN}"} \
  ${GUNICORN_WORKERS:+ "-p GUNICORN_WORKERS=${GUNICORN_WORKERS}"} \
diff --git a/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh b/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh
index 1b5fea640..a6e69e619 100755
--- a/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh
+++ b/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh
@@ -32,7 +32,7 @@ IMAGE_NAMESPACE=${PROJ_TOOLS}
 CLUSTER_NAME="wps-crunchydb-${SUFFIX}"
 
 OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/backup-s3-postgres-cronjob.yaml \
-    -p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+    -p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
     -p JOB_NAME=${JOB_NAME} \
     -p IMAGE_NAMESPACE=${IMAGE_NAMESPACE} \
     -p APP_LABEL=${APP_NAME}-${SUFFIX} \
diff --git a/openshift/scripts/oc_provision_c_haines_cronjob.sh b/openshift/scripts/oc_provision_c_haines_cronjob.sh
index d48f0b4ff..461af4092 100755
--- a/openshift/scripts/oc_provision_c_haines_cronjob.sh
+++ b/openshift/scripts/oc_provision_c_haines_cronjob.sh
@@ -35,7 +35,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/c_haines.cronjob.ya
 -p SUFFIX=${SUFFIX} \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
 -p POSTGRES_USER=wps-crunchydb-${SUFFIX} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"}"
 
 # Apply template (apply or use --dry-run)
diff --git a/openshift/scripts/oc_provision_ec_gdps_cronjob.sh b/openshift/scripts/oc_provision_ec_gdps_cronjob.sh
index db7323dae..0f057bd47 100755
--- a/openshift/scripts/oc_provision_ec_gdps_cronjob.sh
+++ b/openshift/scripts/oc_provision_ec_gdps_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/env_canada_gdps.cro
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh b/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh
index 103f51611..a30496c36 100755
--- a/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh
+++ b/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/env_canada_hrdps.cr
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_ec_rdps_cronjob.sh b/openshift/scripts/oc_provision_ec_rdps_cronjob.sh
index 05c555b81..e6ea5d306 100755
--- a/openshift/scripts/oc_provision_ec_rdps_cronjob.sh
+++ b/openshift/scripts/oc_provision_ec_rdps_cronjob.sh
@@ -37,7 +37,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/env_canada_rdps.cro
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_grass_curing_cronjob.sh b/openshift/scripts/oc_provision_grass_curing_cronjob.sh
index 15c7ec28f..e7f6cb098 100644
--- a/openshift/scripts/oc_provision_grass_curing_cronjob.sh
+++ b/openshift/scripts/oc_provision_grass_curing_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/grass_curing.cronjo
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_nats.sh b/openshift/scripts/oc_provision_nats.sh
index 44ead304f..bd06277a5 100755
--- a/openshift/scripts/oc_provision_nats.sh
+++ b/openshift/scripts/oc_provision_nats.sh
@@ -31,7 +31,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${PATH_NATS} \
  -p POSTGRES_DATABASE=wps \
  ${MEMORY_REQUEST:+ "-p MEMORY_REQUEST=${MEMORY_REQUEST}"} \
  ${MEMORY_LIMIT:+ "-p MEMORY_LIMIT=${MEMORY_LIMIT}"} \
- -p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+ -p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
  -p APP_NAME=${APP_NAME}"
 
 # Apply a template (apply or use --dry-run=client)
diff --git a/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh b/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh
index 93fa741b5..6b4fd9b48 100644
--- a/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh
+++ b/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh
@@ -38,7 +38,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/noaa_gfs.cronjob.ya
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_noaa_nam_cronjob.sh b/openshift/scripts/oc_provision_noaa_nam_cronjob.sh
index c165e0cdf..d6eab6884 100644
--- a/openshift/scripts/oc_provision_noaa_nam_cronjob.sh
+++ b/openshift/scripts/oc_provision_noaa_nam_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/noaa_nam.cronjob.ya
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh b/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh
index 6ffaad54d..4c89cd8e8 100644
--- a/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh
+++ b/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/rdps_sfms.cronjob.y
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_viirs_snow_cronjob.sh b/openshift/scripts/oc_provision_viirs_snow_cronjob.sh
index 1d7dc90f5..4a8089eff 100644
--- a/openshift/scripts/oc_provision_viirs_snow_cronjob.sh
+++ b/openshift/scripts/oc_provision_viirs_snow_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/viirs_snow.cronjob.
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh b/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh
index fa85d2b84..bfd43266c 100755
--- a/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh
+++ b/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh
@@ -37,7 +37,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/wfwx_hourly_actuals
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh b/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh
index 2ba8c3ce1..db83dd3b4 100755
--- a/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh
+++ b/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh
@@ -37,7 +37,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/wfwx_noon_forecasts
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-${SUFFIX}-pguser-wps-crunchydb-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/templates/crunchy.yaml b/openshift/templates/crunchy.yaml
index 491c1869e..9300e07a8 100644
--- a/openshift/templates/crunchy.yaml
+++ b/openshift/templates/crunchy.yaml
@@ -19,7 +19,7 @@ parameters:
     required: true
   - name: APP_NAME
     description: Application name (wps - wildfire predictive services)
-    value: wps-crunchydb
+    value: wps-crunchydb-pg16
     required: true
   - name: BUCKET
     description: S3 bucket name
@@ -71,7 +71,7 @@ objects:
     metadata:
       name: ${APP_NAME}-${SUFFIX}
     spec:
-      postgresVersion: 14
+      postgresVersion: 16
       postGISVersion: "3.3"
       metadata:
         name: ${APP_NAME}-${SUFFIX}
@@ -87,7 +87,7 @@ objects:
             - wps
       instances:
         - name: crunchy
-          replicas: 3
+          replicas: 1
           resources:
             requests:
               cpu: ${CPU_REQUEST}

From 9015a2f291b2672b21e21378d6d68b77968aceeb Mon Sep 17 00:00:00 2001
From: Darren Boss <darren.boss@gov.bc.ca>
Date: Sun, 17 Nov 2024 19:53:02 -0800
Subject: [PATCH 2/2] Change cluster name

---
 openshift/scripts/oc_deploy.sh                                | 4 ++--
 openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh  | 2 +-
 openshift/scripts/oc_provision_c_haines_cronjob.sh            | 2 +-
 openshift/scripts/oc_provision_ec_gdps_cronjob.sh             | 2 +-
 openshift/scripts/oc_provision_ec_hrdps_cronjob.sh            | 2 +-
 openshift/scripts/oc_provision_ec_rdps_cronjob.sh             | 2 +-
 openshift/scripts/oc_provision_grass_curing_cronjob.sh        | 2 +-
 openshift/scripts/oc_provision_nats.sh                        | 2 +-
 openshift/scripts/oc_provision_noaa_gfs_cronjob.sh            | 2 +-
 openshift/scripts/oc_provision_noaa_nam_cronjob.sh            | 2 +-
 openshift/scripts/oc_provision_rdps_sfms_cronjob.sh           | 2 +-
 openshift/scripts/oc_provision_viirs_snow_cronjob.sh          | 2 +-
 openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh | 2 +-
 openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh | 2 +-
 openshift/templates/crunchy.yaml                              | 4 ++--
 15 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/openshift/scripts/oc_deploy.sh b/openshift/scripts/oc_deploy.sh
index f974f95d9..69085c27f 100755
--- a/openshift/scripts/oc_deploy.sh
+++ b/openshift/scripts/oc_deploy.sh
@@ -34,9 +34,9 @@ OBJ_NAME="${APP_NAME}-${SUFFIX}"
 OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${PATH_DEPLOY} \
  -p SUFFIX=${SUFFIX} \
  -p PROJECT_NAMESPACE=${PROJ_TARGET} \
- -p POSTGRES_USER=wps-crunchydb-pg16-${SUFFIX} \
+ -p POSTGRES_USER=wps-crunchydb-16-${SUFFIX} \
  -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
- -p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+ -p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
  -p VANITY_DOMAIN=${VANITY_DOMAIN} \
  ${SECOND_LEVEL_DOMAIN:+ "-p SECOND_LEVEL_DOMAIN=${SECOND_LEVEL_DOMAIN}"} \
  ${GUNICORN_WORKERS:+ "-p GUNICORN_WORKERS=${GUNICORN_WORKERS}"} \
diff --git a/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh b/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh
index a6e69e619..925d5a655 100755
--- a/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh
+++ b/openshift/scripts/oc_provision_backup_s3_postgres_cronjob.sh
@@ -32,7 +32,7 @@ IMAGE_NAMESPACE=${PROJ_TOOLS}
 CLUSTER_NAME="wps-crunchydb-${SUFFIX}"
 
 OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/backup-s3-postgres-cronjob.yaml \
-    -p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+    -p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
     -p JOB_NAME=${JOB_NAME} \
     -p IMAGE_NAMESPACE=${IMAGE_NAMESPACE} \
     -p APP_LABEL=${APP_NAME}-${SUFFIX} \
diff --git a/openshift/scripts/oc_provision_c_haines_cronjob.sh b/openshift/scripts/oc_provision_c_haines_cronjob.sh
index 461af4092..58b335bde 100755
--- a/openshift/scripts/oc_provision_c_haines_cronjob.sh
+++ b/openshift/scripts/oc_provision_c_haines_cronjob.sh
@@ -35,7 +35,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/c_haines.cronjob.ya
 -p SUFFIX=${SUFFIX} \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
 -p POSTGRES_USER=wps-crunchydb-${SUFFIX} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"}"
 
 # Apply template (apply or use --dry-run)
diff --git a/openshift/scripts/oc_provision_ec_gdps_cronjob.sh b/openshift/scripts/oc_provision_ec_gdps_cronjob.sh
index 0f057bd47..dc65ef988 100755
--- a/openshift/scripts/oc_provision_ec_gdps_cronjob.sh
+++ b/openshift/scripts/oc_provision_ec_gdps_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/env_canada_gdps.cro
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh b/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh
index a30496c36..559a833af 100755
--- a/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh
+++ b/openshift/scripts/oc_provision_ec_hrdps_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/env_canada_hrdps.cr
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_ec_rdps_cronjob.sh b/openshift/scripts/oc_provision_ec_rdps_cronjob.sh
index e6ea5d306..392418f02 100755
--- a/openshift/scripts/oc_provision_ec_rdps_cronjob.sh
+++ b/openshift/scripts/oc_provision_ec_rdps_cronjob.sh
@@ -37,7 +37,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/env_canada_rdps.cro
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_grass_curing_cronjob.sh b/openshift/scripts/oc_provision_grass_curing_cronjob.sh
index e7f6cb098..6dc93a8c4 100644
--- a/openshift/scripts/oc_provision_grass_curing_cronjob.sh
+++ b/openshift/scripts/oc_provision_grass_curing_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/grass_curing.cronjo
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_nats.sh b/openshift/scripts/oc_provision_nats.sh
index bd06277a5..69770b117 100755
--- a/openshift/scripts/oc_provision_nats.sh
+++ b/openshift/scripts/oc_provision_nats.sh
@@ -31,7 +31,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${PATH_NATS} \
  -p POSTGRES_DATABASE=wps \
  ${MEMORY_REQUEST:+ "-p MEMORY_REQUEST=${MEMORY_REQUEST}"} \
  ${MEMORY_LIMIT:+ "-p MEMORY_LIMIT=${MEMORY_LIMIT}"} \
- -p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+ -p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
  -p APP_NAME=${APP_NAME}"
 
 # Apply a template (apply or use --dry-run=client)
diff --git a/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh b/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh
index 6b4fd9b48..848107a88 100644
--- a/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh
+++ b/openshift/scripts/oc_provision_noaa_gfs_cronjob.sh
@@ -38,7 +38,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/noaa_gfs.cronjob.ya
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_noaa_nam_cronjob.sh b/openshift/scripts/oc_provision_noaa_nam_cronjob.sh
index d6eab6884..d4e9937bf 100644
--- a/openshift/scripts/oc_provision_noaa_nam_cronjob.sh
+++ b/openshift/scripts/oc_provision_noaa_nam_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/noaa_nam.cronjob.ya
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh b/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh
index 4c89cd8e8..1722b76fd 100644
--- a/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh
+++ b/openshift/scripts/oc_provision_rdps_sfms_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/rdps_sfms.cronjob.y
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_viirs_snow_cronjob.sh b/openshift/scripts/oc_provision_viirs_snow_cronjob.sh
index 4a8089eff..d3b014b23 100644
--- a/openshift/scripts/oc_provision_viirs_snow_cronjob.sh
+++ b/openshift/scripts/oc_provision_viirs_snow_cronjob.sh
@@ -36,7 +36,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/viirs_snow.cronjob.
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh b/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh
index bfd43266c..1700f0a9b 100755
--- a/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh
+++ b/openshift/scripts/oc_provision_wfwx_hourly_actuals_cronjob.sh
@@ -37,7 +37,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/wfwx_hourly_actuals
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh b/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh
index db83dd3b4..8fbd6e325 100755
--- a/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh
+++ b/openshift/scripts/oc_provision_wfwx_noon_forecasts_cronjob.sh
@@ -37,7 +37,7 @@ OC_PROCESS="oc -n ${PROJ_TARGET} process -f ${TEMPLATE_PATH}/wfwx_noon_forecasts
 -p SUFFIX=${SUFFIX} \
 -p SCHEDULE=\"${SCHEDULE}\" \
 -p POSTGRES_DATABASE=${POSTGRES_DATABASE:-${APP_NAME}} \
--p CRUNCHYDB_USER=wps-crunchydb-pg16-${SUFFIX}-pguser-wps-crunchydb-pg16-${SUFFIX} \
+-p CRUNCHYDB_USER=wps-crunchydb-16-${SUFFIX}-pguser-wps-crunchydb-16-${SUFFIX} \
 ${PROJ_TOOLS:+ "-p PROJ_TOOLS=${PROJ_TOOLS}"} \
 ${IMAGE_REGISTRY:+ "-p IMAGE_REGISTRY=${IMAGE_REGISTRY}"}"
 
diff --git a/openshift/templates/crunchy.yaml b/openshift/templates/crunchy.yaml
index 9300e07a8..d8eaf9e22 100644
--- a/openshift/templates/crunchy.yaml
+++ b/openshift/templates/crunchy.yaml
@@ -19,7 +19,7 @@ parameters:
     required: true
   - name: APP_NAME
     description: Application name (wps - wildfire predictive services)
-    value: wps-crunchydb-pg16
+    value: wps-crunchydb-16
     required: true
   - name: BUCKET
     description: S3 bucket name
@@ -87,7 +87,7 @@ objects:
             - wps
       instances:
         - name: crunchy
-          replicas: 1
+          replicas: 2
           resources:
             requests:
               cpu: ${CPU_REQUEST}