From b8ad8f3e4d5f68a76307df77ceef986f03c22c09 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 08:55:45 -0800
Subject: [PATCH 01/37] Update DeploymentConfig to Deployment

---
 openshift/api-deploy-config.yaml        | 12 ++++++------
 openshift/backup-deploy-config.yaml     |  6 +++---
 openshift/client-deploy-config.yaml     | 10 +++++-----
 openshift/pdf-deploy-config.yaml        | 12 ++++++------
 openshift/postgresql-deploy-config.yaml | 10 +++++-----
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index 27a918e56..683b8e6d0 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -17,14 +17,14 @@ objects:
       lookupPolicy:
         local: false
   - apiVersion: v1 #dc: api
-    kind: DeploymentConfig
+    kind: Deployment
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
     spec:
       replicas: 1
-      selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+      # selector:
+      #   deploymentconfig: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -33,7 +33,7 @@ objects:
           maxUnavailable: 1
           timeoutSeconds: 600
           updatePeriodSeconds: 1
-        type: Rolling
+        type: RollingUpdate
       template:
         metadata:
           creationTimestamp: null
@@ -159,8 +159,8 @@ objects:
           port: 8080
           protocol: TCP
           targetPort: 8080
-      selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+      # selector:
+      #   deploymentconfig: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/backup-deploy-config.yaml b/openshift/backup-deploy-config.yaml
index 14d17d728..57c55a45d 100644
--- a/openshift/backup-deploy-config.yaml
+++ b/openshift/backup-deploy-config.yaml
@@ -50,14 +50,14 @@ objects:
       ftp-url: "${FTP_URL}"
       ftp-user: "${FTP_USER}"
       ftp-password: "${FTP_PASSWORD}"
-  - kind: DeploymentConfig
+  - kind: Deployment
     apiVersion: v1
     metadata:
       name: "${NAME}-${ENV}"
       labels:
         template: "${NAME}-${ENV}"
-      annotations:
-        description: Defines how to deploy the ${NAME}-${ENV}
+      # annotations:
+      #   description: Defines how to deploy the ${NAME}-${ENV}
     spec:
       strategy:
         type: Recreate
diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index f9cb304f4..d747cbac1 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -17,7 +17,7 @@ objects:
       lookupPolicy:
         local: false
   - apiVersion: v1
-    kind: DeploymentConfig
+    kind: Deployment
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
@@ -89,13 +89,13 @@ objects:
           port: 8080
           protocol: TCP
           targetPort: 8080
-      selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+      # selector:
+      #   deploymentconfig: ${NAME}${SUFFIX}
   - apiVersion: route.openshift.io/v1
     kind: Route
     metadata:
-      annotations:
-        haproxy.router.openshift.io/timeout: 1h
+      # annotations:
+      #   haproxy.router.openshift.io/timeout: 1h
       creationTimestamp: null
       name: ${NAME}-${ENV}
     spec:
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index f711a4eea..9be0c285a 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -17,14 +17,14 @@ objects:
       lookupPolicy:
         local: false
   - apiVersion: v1 #dc: pdf
-    kind: DeploymentConfig
+    kind: Deployment
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
     spec:
       replicas: 1
-      selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+      # selector:
+      #   deploymentconfig: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -33,7 +33,7 @@ objects:
           maxUnavailable: 1
           timeoutSeconds: 600
           updatePeriodSeconds: 1
-        type: Rolling
+        type: RollingUpdate
       template:
         metadata:
           creationTimestamp: null
@@ -87,8 +87,8 @@ objects:
           port: 8080
           protocol: TCP
           targetPort: 8080
-      selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+      # selector:
+      #   deploymentconfig: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 36a66081c..9e575550f 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -4,15 +4,15 @@ metadata:
   name: ${PROJECT_NAME}
 objects:
   - apiVersion: v1
-    kind: DeploymentConfig
+    kind: Deployment
     metadata:
       name: ${NAME}-${ENV}
     labels:
       shared: "true"
     spec:
       replicas: 1
-      selector:
-        deploymentconfig: ${NAME}-${ENV}
+      # selector:
+      #   deploymentconfig: ${NAME}-${ENV}
       strategy:
         activeDeadlineSeconds: 21600
         resources: {}
@@ -129,8 +129,8 @@ objects:
           protocol: TCP
           port: 5432
           targetPort: 5432
-      selector:
-        deploymentconfig: ${NAME}-${ENV}
+      # selector:
+      #   deploymentconfig: ${NAME}-${ENV}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME

From 0959e8047949f91ebc3b2cc67dcb79232f94379b Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 09:31:02 -0800
Subject: [PATCH 02/37] Used ubuntu-22.04 instead of latest to avoid oc command
 not recognized issue

---
 .github/workflows/sbi-build-deploy.yml | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/sbi-build-deploy.yml b/.github/workflows/sbi-build-deploy.yml
index 0dffbb515..46089cc7b 100644
--- a/.github/workflows/sbi-build-deploy.yml
+++ b/.github/workflows/sbi-build-deploy.yml
@@ -11,7 +11,8 @@ defaults:
 
 jobs:
   cancel-previous-runs:
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     permissions:
       actions: write
     steps:
@@ -21,7 +22,8 @@ jobs:
           access_token: ${{ github.token }}
 
   build:
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline
@@ -38,7 +40,8 @@ jobs:
           DEBUG=* npm run build -- --pr=${{ github.event.pull_request.number }} --git.branch.name=${{github.head_ref}} --git.ref=${{github.head_ref}}
 
   deploy-to-dev:
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: [build]
     defaults:
       run:
@@ -59,7 +62,8 @@ jobs:
     needs: [build, deploy-to-dev]
     environment:
       name: test
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline
@@ -79,7 +83,8 @@ jobs:
     needs: [build, deploy-to-test]
     environment:
       name: prod
-    runs-on: ubuntu-latest
+    # runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     defaults:
       run:
         working-directory: ./.pipeline

From 46419edc7626cab1015cd4bb5b2a5187920b6461 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 09:43:23 -0800
Subject: [PATCH 03/37] Updated apiversion for deployment config file

---
 openshift/api-deploy-config.yaml        | 3 ++-
 openshift/backup-deploy-config.yaml     | 3 ++-
 openshift/client-deploy-config.yaml     | 3 ++-
 openshift/pdf-deploy-config.yaml        | 3 ++-
 openshift/postgresql-deploy-config.yaml | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index 683b8e6d0..04e03a6a4 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -16,7 +16,8 @@ objects:
     spec:
       lookupPolicy:
         local: false
-  - apiVersion: v1 #dc: api
+  # - apiVersion: v1 #dc: api
+  - apiVersion: apps/v1
     kind: Deployment
     metadata:
       creationTimestamp: null
diff --git a/openshift/backup-deploy-config.yaml b/openshift/backup-deploy-config.yaml
index 57c55a45d..1bb03b2c3 100644
--- a/openshift/backup-deploy-config.yaml
+++ b/openshift/backup-deploy-config.yaml
@@ -51,7 +51,8 @@ objects:
       ftp-user: "${FTP_USER}"
       ftp-password: "${FTP_PASSWORD}"
   - kind: Deployment
-    apiVersion: v1
+    # apiVersion: v1
+    apiVersion: apps/v1
     metadata:
       name: "${NAME}-${ENV}"
       labels:
diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index d747cbac1..cda4c769d 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -16,7 +16,8 @@ objects:
     spec:
       lookupPolicy:
         local: false
-  - apiVersion: v1
+  # - apiVersion: v1
+  - apiVersion: apps/v1
     kind: Deployment
     metadata:
       creationTimestamp: null
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index 9be0c285a..5e059becd 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -16,7 +16,8 @@ objects:
     spec:
       lookupPolicy:
         local: false
-  - apiVersion: v1 #dc: pdf
+  # - apiVersion: v1 #dc: pdf
+  - apiVersion: apps/v1
     kind: Deployment
     metadata:
       creationTimestamp: null
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 9e575550f..298bf4af8 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -3,7 +3,8 @@ apiVersion: template.openshift.io/v1
 metadata:
   name: ${PROJECT_NAME}
 objects:
-  - apiVersion: v1
+  # - apiVersion: v1
+  - apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: ${NAME}-${ENV}

From 54c7ec5b7c34a316db839477405d158a3d3a67e4 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 12:30:43 -0800
Subject: [PATCH 04/37] Added spec.selector section back

---
 openshift/api-deploy-config.yaml        | 8 ++++----
 openshift/client-deploy-config.yaml     | 4 ++--
 openshift/pdf-deploy-config.yaml        | 8 ++++----
 openshift/postgresql-deploy-config.yaml | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index 04e03a6a4..33f503847 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -24,8 +24,8 @@ objects:
       name: ${NAME}${SUFFIX}
     spec:
       replicas: 1
-      # selector:
-      #   deploymentconfig: ${NAME}${SUFFIX}
+      selector:
+        deploymentconfig: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -160,8 +160,8 @@ objects:
           port: 8080
           protocol: TCP
           targetPort: 8080
-      # selector:
-      #   deploymentconfig: ${NAME}${SUFFIX}
+      selector:
+        deploymentconfig: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index cda4c769d..e7724a099 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -90,8 +90,8 @@ objects:
           port: 8080
           protocol: TCP
           targetPort: 8080
-      # selector:
-      #   deploymentconfig: ${NAME}${SUFFIX}
+      selector:
+        deploymentconfig: ${NAME}${SUFFIX}
   - apiVersion: route.openshift.io/v1
     kind: Route
     metadata:
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index 5e059becd..039f43317 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -24,8 +24,8 @@ objects:
       name: ${NAME}${SUFFIX}
     spec:
       replicas: 1
-      # selector:
-      #   deploymentconfig: ${NAME}${SUFFIX}
+      selector:
+        deploymentconfig: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -88,8 +88,8 @@ objects:
           port: 8080
           protocol: TCP
           targetPort: 8080
-      # selector:
-      #   deploymentconfig: ${NAME}${SUFFIX}
+      selector:
+        deploymentconfig: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 298bf4af8..07348ae87 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -12,8 +12,8 @@ objects:
       shared: "true"
     spec:
       replicas: 1
-      # selector:
-      #   deploymentconfig: ${NAME}-${ENV}
+      selector:
+        deploymentconfig: ${NAME}-${ENV}
       strategy:
         activeDeadlineSeconds: 21600
         resources: {}
@@ -130,8 +130,8 @@ objects:
           protocol: TCP
           port: 5432
           targetPort: 5432
-      # selector:
-      #   deploymentconfig: ${NAME}-${ENV}
+      selector:
+        deploymentconfig: ${NAME}-${ENV}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME

From ebcf5d1264880f8f8cefcfc57291d246106337e0 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 12:41:25 -0800
Subject: [PATCH 05/37] updated selector values

---
 openshift/api-deploy-config.yaml        | 9 ++++++---
 openshift/client-deploy-config.yaml     | 9 ++++++---
 openshift/pdf-deploy-config.yaml        | 9 ++++++---
 openshift/postgresql-deploy-config.yaml | 9 ++++++---
 openshift/secrets/ccw-secrets.yaml      | 3 ++-
 openshift/secrets/ftp-secrets.yaml      | 3 ++-
 6 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index 33f503847..a17fc61a4 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -25,7 +25,8 @@ objects:
     spec:
       replicas: 1
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -39,7 +40,8 @@ objects:
         metadata:
           creationTimestamp: null
           labels:
-            deploymentconfig: ${NAME}${SUFFIX}
+            # deploymentconfig: ${NAME}${SUFFIX}
+            deployment: ${NAME}${SUFFIX}
         spec:
           containers:
             - image: ${NAME}:${VERSION}
@@ -161,7 +163,8 @@ objects:
           protocol: TCP
           targetPort: 8080
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index e7724a099..77641cbea 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -25,13 +25,15 @@ objects:
     spec:
       replicas: 1
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
       strategy: {}
       template:
         metadata:
           creationTimestamp: null
           labels:
-            deploymentconfig: ${NAME}${SUFFIX}
+            # deploymentconfig: ${NAME}${SUFFIX}
+            deployment: ${NAME}${SUFFIX}
         spec:
           containers:
             - image: ${NAME}:${VERSION}
@@ -91,7 +93,8 @@ objects:
           protocol: TCP
           targetPort: 8080
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
   - apiVersion: route.openshift.io/v1
     kind: Route
     metadata:
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index 039f43317..00dee2039 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -25,7 +25,8 @@ objects:
     spec:
       replicas: 1
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -39,7 +40,8 @@ objects:
         metadata:
           creationTimestamp: null
           labels:
-            deploymentconfig: ${NAME}${SUFFIX}
+            # deploymentconfig: ${NAME}${SUFFIX}
+            deployment: ${NAME}${SUFFIX}
         spec:
           containers:
             - image: ${NAME}:${VERSION}
@@ -89,7 +91,8 @@ objects:
           protocol: TCP
           targetPort: 8080
       selector:
-        deploymentconfig: ${NAME}${SUFFIX}
+        # deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 07348ae87..a145930d3 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -13,7 +13,8 @@ objects:
     spec:
       replicas: 1
       selector:
-        deploymentconfig: ${NAME}-${ENV}
+        # deploymentconfig: ${NAME}-${ENV}
+        deployment: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         resources: {}
@@ -24,7 +25,8 @@ objects:
         metadata:
           name: ${NAME}-${ENV}
           labels:
-            deploymentconfig: ${NAME}-${ENV}
+            # deploymentconfig: ${NAME}-${ENV}
+            deployment: ${NAME}${SUFFIX}
         spec:
           containers:
             - image: image-registry.openshift-image-registry.svc:5000/e82e9a-tools/${IMAGE_STREAM_TAG}
@@ -131,7 +133,8 @@ objects:
           port: 5432
           targetPort: 5432
       selector:
-        deploymentconfig: ${NAME}-${ENV}
+        # deploymentconfig: ${NAME}-${ENV}
+        deployment: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/secrets/ccw-secrets.yaml b/openshift/secrets/ccw-secrets.yaml
index 056c31f28..8d788490c 100644
--- a/openshift/secrets/ccw-secrets.yaml
+++ b/openshift/secrets/ccw-secrets.yaml
@@ -9,7 +9,8 @@ objects:
     metadata:
       name: ${NAME}${SUFFIX}
     selector:
-      deploymentconfig: ${NAME}${SUFFIX}
+      # deploymentconfig: ${NAME}${SUFFIX}
+      deployment: ${NAME}${SUFFIX}
     stringData:
       CCW_USER_ID: "${CCW_USER_ID}"
       CCW_USER_GUID: "${CCW_USER_GUID}"
diff --git a/openshift/secrets/ftp-secrets.yaml b/openshift/secrets/ftp-secrets.yaml
index 9ccfd8a8e..2775a2c12 100644
--- a/openshift/secrets/ftp-secrets.yaml
+++ b/openshift/secrets/ftp-secrets.yaml
@@ -9,7 +9,8 @@ objects:
     metadata:
       name: ${NAME}${SUFFIX}
     selector:
-      deploymentconfig: ${NAME}${SUFFIX}
+      # deploymentconfig: ${NAME}${SUFFIX}
+      deployment: ${NAME}${SUFFIX}
     stringData:
       ftp-user: "${FTP_USER}"
       ftp-password: "${FTP_PASSWORD}"

From 3d1d891e09d38677dbb843bdd3e02ff7d7a44047 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 12:55:50 -0800
Subject: [PATCH 06/37] test if api deployment works

---
 openshift/api-deploy-config.yaml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index a17fc61a4..e675824b4 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -24,9 +24,8 @@ objects:
       name: ${NAME}${SUFFIX}
     spec:
       replicas: 1
-      selector:
-        # deploymentconfig: ${NAME}${SUFFIX}
-        deployment: ${NAME}${SUFFIX}
+      # selector:
+      #   deploymentconfig: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -162,9 +161,8 @@ objects:
           port: 8080
           protocol: TCP
           targetPort: 8080
-      selector:
-        # deploymentconfig: ${NAME}${SUFFIX}
-        deployment: ${NAME}${SUFFIX}
+      # selector:
+      #   deploymentconfig: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME

From d6d2cefa5fd0be553f79f31f47c33580c57f2554 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:03:54 -0800
Subject: [PATCH 07/37] test if api deployment works 1

---
 openshift/api-deploy-config.yaml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index e675824b4..a17fc61a4 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -24,8 +24,9 @@ objects:
       name: ${NAME}${SUFFIX}
     spec:
       replicas: 1
-      # selector:
-      #   deploymentconfig: ${NAME}${SUFFIX}
+      selector:
+        # deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -161,8 +162,9 @@ objects:
           port: 8080
           protocol: TCP
           targetPort: 8080
-      # selector:
-      #   deploymentconfig: ${NAME}${SUFFIX}
+      selector:
+        # deploymentconfig: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME

From 38894e20fca5b2e75411804fcd07d94923ee2883 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:13:15 -0800
Subject: [PATCH 08/37] test if api deployment works 2

---
 openshift/api-deploy-config.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index a17fc61a4..53749c72f 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -22,11 +22,14 @@ objects:
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       replicas: 1
       selector:
         # deploymentconfig: ${NAME}${SUFFIX}
-        deployment: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:

From 07bd3f939cbd4c70432fd677be4688d1ec8950e8 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:25:45 -0800
Subject: [PATCH 09/37] Updated selector value for other deployment file

---
 openshift/client-deploy-config.yaml          | 8 ++++++--
 openshift/pdf-deploy-config.yaml             | 8 ++++++--
 openshift/postgresql-deploy-config.yaml      | 8 ++++++--
 openshift/secrets/ccw-secrets.yaml           | 5 ++++-
 openshift/secrets/db-postgresql-secrets.yaml | 6 +++++-
 openshift/secrets/ftp-secrets.yaml           | 5 ++++-
 6 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index 77641cbea..c1860e541 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -22,11 +22,14 @@ objects:
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       replicas: 1
       selector:
         # deploymentconfig: ${NAME}${SUFFIX}
-        deployment: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
       strategy: {}
       template:
         metadata:
@@ -94,7 +97,8 @@ objects:
           targetPort: 8080
       selector:
         # deploymentconfig: ${NAME}${SUFFIX}
-        deployment: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
   - apiVersion: route.openshift.io/v1
     kind: Route
     metadata:
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index 00dee2039..21eaa7b8f 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -22,11 +22,14 @@ objects:
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       replicas: 1
       selector:
         # deploymentconfig: ${NAME}${SUFFIX}
-        deployment: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         rollingParams:
@@ -92,7 +95,8 @@ objects:
           targetPort: 8080
       selector:
         # deploymentconfig: ${NAME}${SUFFIX}
-        deployment: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index a145930d3..cfbd5c4d9 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -8,13 +8,16 @@ objects:
     kind: Deployment
     metadata:
       name: ${NAME}-${ENV}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     labels:
       shared: "true"
     spec:
       replicas: 1
       selector:
         # deploymentconfig: ${NAME}-${ENV}
-        deployment: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
       strategy:
         activeDeadlineSeconds: 21600
         resources: {}
@@ -134,7 +137,8 @@ objects:
           targetPort: 5432
       selector:
         # deploymentconfig: ${NAME}-${ENV}
-        deployment: ${NAME}${SUFFIX}
+        matchLabels:
+          deployment: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/secrets/ccw-secrets.yaml b/openshift/secrets/ccw-secrets.yaml
index 8d788490c..28a52a238 100644
--- a/openshift/secrets/ccw-secrets.yaml
+++ b/openshift/secrets/ccw-secrets.yaml
@@ -3,6 +3,8 @@ kind: Template
 metadata:
   creationTimestamp: null
   name: "true"
+  labels:
+    deployment: ${NAME}${SUFFIX}
 objects:
   - kind: Secret
     apiVersion: v1
@@ -10,7 +12,8 @@ objects:
       name: ${NAME}${SUFFIX}
     selector:
       # deploymentconfig: ${NAME}${SUFFIX}
-      deployment: ${NAME}${SUFFIX}
+      matchLabels:
+          deployment: ${NAME}${SUFFIX}
     stringData:
       CCW_USER_ID: "${CCW_USER_ID}"
       CCW_USER_GUID: "${CCW_USER_GUID}"
diff --git a/openshift/secrets/db-postgresql-secrets.yaml b/openshift/secrets/db-postgresql-secrets.yaml
index 30420f950..4eee5ded0 100644
--- a/openshift/secrets/db-postgresql-secrets.yaml
+++ b/openshift/secrets/db-postgresql-secrets.yaml
@@ -3,13 +3,17 @@ kind: Template
 metadata:
   creationTimestamp: null
   name: "true"
+  labels:
+    deployment: ${NAME}${SUFFIX}
 objects:
   - kind: Secret
     apiVersion: v1
     metadata:
       name: ${NAME}-${ENV}
     selector:
-      deploymentconfig: ${NAME}-${ENV}
+      # deploymentconfig: ${NAME}-${ENV}
+      matchLabels:
+          deployment: ${NAME}${SUFFIX}
     stringData:
       admin-password: "${POSTGRESQL_ADMIN_PASSWORD}"
       database-password: "${POSTGRESQL_PASSWORD}"
diff --git a/openshift/secrets/ftp-secrets.yaml b/openshift/secrets/ftp-secrets.yaml
index 2775a2c12..0be9656b1 100644
--- a/openshift/secrets/ftp-secrets.yaml
+++ b/openshift/secrets/ftp-secrets.yaml
@@ -3,6 +3,8 @@ kind: Template
 metadata:
   creationTimestamp: null
   name: "true"
+  labels:
+    deployment: ${NAME}${SUFFIX}
 objects:
   - kind: Secret
     apiVersion: v1
@@ -10,7 +12,8 @@ objects:
       name: ${NAME}${SUFFIX}
     selector:
       # deploymentconfig: ${NAME}${SUFFIX}
-      deployment: ${NAME}${SUFFIX}
+      matchLabels:
+          deployment: ${NAME}${SUFFIX}
     stringData:
       ftp-user: "${FTP_USER}"
       ftp-password: "${FTP_PASSWORD}"

From 141b8b2f3d42a0bcd063c1aaf19a50749c347ca9 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:36:20 -0800
Subject: [PATCH 10/37] Added lables for service

---
 openshift/client-deploy-config.yaml     | 2 ++
 openshift/pdf-deploy-config.yaml        | 2 ++
 openshift/postgresql-deploy-config.yaml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index c1860e541..d66e62648 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -89,6 +89,8 @@ objects:
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       ports:
         - name: web
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index 21eaa7b8f..d018f99a7 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -87,6 +87,8 @@ objects:
     metadata:
       creationTimestamp: null
       name: ${NAME}${SUFFIX}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     spec:
       ports:
         - name: web
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index cfbd5c4d9..933dddb40 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -127,6 +127,8 @@ objects:
     apiVersion: v1
     metadata:
       name: ${NAME}-${ENV}
+      labels:
+        deployment: ${NAME}${SUFFIX}
     labels:
       shared: "true"
     spec:

From f018e01ed4a92e22003116c7d0dbe34c84167a6d Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:47:46 -0800
Subject: [PATCH 11/37] test if client deployment works afger api version
 updated

---
 openshift/client-deploy-config.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index d66e62648..fdc08bad0 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -84,7 +84,8 @@ objects:
               name: ${NAME}:${VERSION}
           type: ImageChange
         - type: ConfigChange
-  - apiVersion: v1
+  # - apiVersion: v1
+  - apiVersion: apps/v1
     kind: Service
     metadata:
       creationTimestamp: null

From 48383546ddfe1714a4f30003a5dfbdd4284e10df Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:52:40 -0800
Subject: [PATCH 12/37] Updated api version of pdf and db deployment service

---
 openshift/pdf-deploy-config.yaml        | 3 ++-
 openshift/postgresql-deploy-config.yaml | 7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index d018f99a7..b7c0b928d 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -82,7 +82,8 @@ objects:
               name: ${NAME}:${VERSION}
           type: ImageChange
         - type: ConfigChange
-  - apiVersion: v1 #service: pdf
+  # - apiVersion: v1 #service: pdf
+  - apiVersion: apps/v1 #service: pdf
     kind: Service
     metadata:
       creationTimestamp: null
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 933dddb40..5255fc5f2 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -124,11 +124,12 @@ objects:
         requests:
           storage: "${PERSISTENT_VOLUME_SIZE}"
   - kind: Service
-    apiVersion: v1
+    # apiVersion: v1
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}-${ENV}
       labels:
-        deployment: ${NAME}${SUFFIX}
+        deployment: ${NAME}-${ENV}
     labels:
       shared: "true"
     spec:
@@ -140,7 +141,7 @@ objects:
       selector:
         # deploymentconfig: ${NAME}-${ENV}
         matchLabels:
-          deployment: ${NAME}${SUFFIX}
+          deployment: ${NAME}-${ENV}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME

From ad585d2167a3f83f2bad057df2e6a4ef6eebe529 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 13:57:20 -0800
Subject: [PATCH 13/37] back deployment updated

---
 openshift/backup-deploy-config.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openshift/backup-deploy-config.yaml b/openshift/backup-deploy-config.yaml
index 1bb03b2c3..6e92051a9 100644
--- a/openshift/backup-deploy-config.yaml
+++ b/openshift/backup-deploy-config.yaml
@@ -64,7 +64,9 @@ objects:
         type: Recreate
       replicas: 1
       selector:
-        name: "${NAME}-${ENV}"
+        # name: "${NAME}-${ENV}"
+        matchLabels:
+          template: "${NAME}-${ENV}"
       template:
         metadata:
           name: "${NAME}-${ENV}"

From 9087f795c0c1124b68a0e29260d36df710b30cfb Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:00:31 -0800
Subject: [PATCH 14/37] backup deployment updated 2

---
 openshift/backup-deploy-config.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openshift/backup-deploy-config.yaml b/openshift/backup-deploy-config.yaml
index 6e92051a9..348aff2b3 100644
--- a/openshift/backup-deploy-config.yaml
+++ b/openshift/backup-deploy-config.yaml
@@ -57,6 +57,7 @@ objects:
       name: "${NAME}-${ENV}"
       labels:
         template: "${NAME}-${ENV}"
+        name: "${NAME}-${ENV}"
       # annotations:
       #   description: Defines how to deploy the ${NAME}-${ENV}
     spec:
@@ -66,7 +67,7 @@ objects:
       selector:
         # name: "${NAME}-${ENV}"
         matchLabels:
-          template: "${NAME}-${ENV}"
+          name: "${NAME}-${ENV}"
       template:
         metadata:
           name: "${NAME}-${ENV}"

From c6ee56d791b72f3bf970df672c3af707fed33b5d Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:07:26 -0800
Subject: [PATCH 15/37] Updated service api version back to v1

---
 openshift/client-deploy-config.yaml     | 3 +--
 openshift/pdf-deploy-config.yaml        | 3 +--
 openshift/postgresql-deploy-config.yaml | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index fdc08bad0..d66e62648 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -84,8 +84,7 @@ objects:
               name: ${NAME}:${VERSION}
           type: ImageChange
         - type: ConfigChange
-  # - apiVersion: v1
-  - apiVersion: apps/v1
+  - apiVersion: v1
     kind: Service
     metadata:
       creationTimestamp: null
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index b7c0b928d..d018f99a7 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -82,8 +82,7 @@ objects:
               name: ${NAME}:${VERSION}
           type: ImageChange
         - type: ConfigChange
-  # - apiVersion: v1 #service: pdf
-  - apiVersion: apps/v1 #service: pdf
+  - apiVersion: v1 #service: pdf
     kind: Service
     metadata:
       creationTimestamp: null
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 5255fc5f2..734a0a1dc 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -124,8 +124,7 @@ objects:
         requests:
           storage: "${PERSISTENT_VOLUME_SIZE}"
   - kind: Service
-    # apiVersion: v1
-    apiVersion: apps/v1
+    apiVersion: v1
     metadata:
       name: ${NAME}-${ENV}
       labels:

From dc1bb7f9f91007ab06d635b3bd9a605b193cf879 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:14:05 -0800
Subject: [PATCH 16/37] test if client works

---
 openshift/client-deploy-config.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index d66e62648..fdc08bad0 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -84,7 +84,8 @@ objects:
               name: ${NAME}:${VERSION}
           type: ImageChange
         - type: ConfigChange
-  - apiVersion: v1
+  # - apiVersion: v1
+  - apiVersion: apps/v1
     kind: Service
     metadata:
       creationTimestamp: null

From fe5205c171e189e90da152687c4fadfd35736e99 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:22:50 -0800
Subject: [PATCH 17/37] Updated pdf service api version to apps/v1

---
 openshift/pdf-deploy-config.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index d018f99a7..b7c0b928d 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -82,7 +82,8 @@ objects:
               name: ${NAME}:${VERSION}
           type: ImageChange
         - type: ConfigChange
-  - apiVersion: v1 #service: pdf
+  # - apiVersion: v1 #service: pdf
+  - apiVersion: apps/v1 #service: pdf
     kind: Service
     metadata:
       creationTimestamp: null

From 1270d327558566ae1235e5290bb53e43909fd0f0 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:40:34 -0800
Subject: [PATCH 18/37] db deployment service api version updated

---
 openshift/postgresql-deploy-config.yaml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 734a0a1dc..5255fc5f2 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -124,7 +124,8 @@ objects:
         requests:
           storage: "${PERSISTENT_VOLUME_SIZE}"
   - kind: Service
-    apiVersion: v1
+    # apiVersion: v1
+    apiVersion: apps/v1
     metadata:
       name: ${NAME}-${ENV}
       labels:

From 2ce86572d25d0c1192b88636eaa9e2a1022d1e03 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 14:57:59 -0800
Subject: [PATCH 19/37] updated service kind api version back to v1

---
 openshift/client-deploy-config.yaml     | 3 +--
 openshift/pdf-deploy-config.yaml        | 3 +--
 openshift/postgresql-deploy-config.yaml | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index fdc08bad0..d66e62648 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -84,8 +84,7 @@ objects:
               name: ${NAME}:${VERSION}
           type: ImageChange
         - type: ConfigChange
-  # - apiVersion: v1
-  - apiVersion: apps/v1
+  - apiVersion: v1
     kind: Service
     metadata:
       creationTimestamp: null
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index b7c0b928d..d018f99a7 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -82,8 +82,7 @@ objects:
               name: ${NAME}:${VERSION}
           type: ImageChange
         - type: ConfigChange
-  # - apiVersion: v1 #service: pdf
-  - apiVersion: apps/v1 #service: pdf
+  - apiVersion: v1 #service: pdf
     kind: Service
     metadata:
       creationTimestamp: null
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 5255fc5f2..734a0a1dc 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -124,8 +124,7 @@ objects:
         requests:
           storage: "${PERSISTENT_VOLUME_SIZE}"
   - kind: Service
-    # apiVersion: v1
-    apiVersion: apps/v1
+    apiVersion: v1
     metadata:
       name: ${NAME}-${ENV}
       labels:

From 31b8cfe3c2c6001c9fd43381f2c1ef19ba90122f Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:05:25 -0800
Subject: [PATCH 20/37] Corrected the selector of service kind

---
 openshift/client-deploy-config.yaml     | 4 +---
 openshift/pdf-deploy-config.yaml        | 4 +---
 openshift/postgresql-deploy-config.yaml | 4 +---
 3 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index d66e62648..be21b119e 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -98,9 +98,7 @@ objects:
           protocol: TCP
           targetPort: 8080
       selector:
-        # deploymentconfig: ${NAME}${SUFFIX}
-        matchLabels:
-          deployment: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
   - apiVersion: route.openshift.io/v1
     kind: Route
     metadata:
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index d018f99a7..3f138095c 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -96,9 +96,7 @@ objects:
           protocol: TCP
           targetPort: 8080
       selector:
-        # deploymentconfig: ${NAME}${SUFFIX}
-        matchLabels:
-          deployment: ${NAME}${SUFFIX}
+        deployment: ${NAME}${SUFFIX}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 734a0a1dc..2ac919f0e 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -138,9 +138,7 @@ objects:
           port: 5432
           targetPort: 5432
       selector:
-        # deploymentconfig: ${NAME}-${ENV}
-        matchLabels:
-          deployment: ${NAME}-${ENV}
+        deployment: ${NAME}-${ENV}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME

From 23d9ac24a3cbdf363aa7c3da3082480421ed9fa9 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:20:54 -0800
Subject: [PATCH 21/37] removed resources limits section

---
 openshift/client-deploy-config.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index be21b119e..3d2b27db9 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -44,13 +44,13 @@ objects:
               ports:
                 - containerPort: 8080
                   protocol: TCP
-              resources:
-                requests:
-                  cpu: 250m
-                  memory: 32Mi
-                limits:
-                  cpu: 250m
-                  memory: 64Mi
+              # resources:
+              #   requests:
+              #     cpu: 250m
+              #     memory: 32Mi
+              #   limits:
+              #     cpu: 250m
+              #     memory: 64Mi
               env:
                 - name: REACT_APP_SSO_HOST
                   valueFrom:

From 20f7f50728b4cc300dafbc0cd12ed208bc4ba425 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Mon, 27 Jan 2025 15:59:27 -0800
Subject: [PATCH 22/37] remove resource limits sections

---
 openshift/api-deploy-config.yaml        | 14 +++++++-------
 openshift/postgresql-deploy-config.yaml | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index 53749c72f..52d618099 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -52,13 +52,13 @@ objects:
               ports:
                 - containerPort: 8080
                   protocol: TCP
-              resources:
-                requests:
-                  cpu: 500m
-                  memory: 512Mi
-                limits:
-                  cpu: 750m
-                  memory: 768Mi
+              # resources:
+              #   requests:
+              #     cpu: 500m
+              #     memory: 512Mi
+              #   limits:
+              #     cpu: 750m
+              #     memory: 768Mi
               livenessProbe:
                 httpGet:
                   path: /healthz
diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 2ac919f0e..89addfa9f 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -56,13 +56,13 @@ objects:
               ports:
                 - containerPort: 5432
                   protocol: TCP
-              resources:
-                requests:
-                  cpu: 250m
-                  memory: 512Mi
-                limits:
-                  cpu: 500m
-                  memory: 1Gi
+              # resources:
+              #   requests:
+              #     cpu: 250m
+              #     memory: 512Mi
+              #   limits:
+              #     cpu: 500m
+              #     memory: 1Gi
               terminationMessagePath: /dev/termination-log
               terminationMessagePolicy: File
               volumeMounts:

From 85bae2d261deec27997163da8026e62b76523f5e Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 08:52:08 -0800
Subject: [PATCH 23/37] Updated image of the client when pulling image

---
 openshift/client-deploy-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index 3d2b27db9..ca37b86b4 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -39,7 +39,7 @@ objects:
             deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: ${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000/e82e9a-tools:${NAME}:${VERSION}
               name: client
               ports:
                 - containerPort: 8080

From 8d30d1090b9e74c46dde2e342aad62406dcae08e Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 08:58:43 -0800
Subject: [PATCH 24/37] Updated image of the client when pulling image

---
 openshift/client-deploy-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index ca37b86b4..f97888845 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -39,7 +39,7 @@ objects:
             deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: image-registry.openshift-image-registry.svc:5000/e82e9a-tools:${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000:${NAME}:${VERSION}
               name: client
               ports:
                 - containerPort: 8080

From 7d43528274724d1da30643a137919a520a4d313e Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 09:10:55 -0800
Subject: [PATCH 25/37] Updated image of the client when pulling image

---
 openshift/client-deploy-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index f97888845..2f1732945 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -39,7 +39,7 @@ objects:
             deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: image-registry.openshift-image-registry.svc:5000:${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000/${NAME}:${VERSION}
               name: client
               ports:
                 - containerPort: 8080

From bf25a5e64ad02973cd8fb7cc7964e755276297b8 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 09:15:11 -0800
Subject: [PATCH 26/37] Updated image of the client when pulling image

---
 openshift/client-deploy-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index 2f1732945..0c17b7f00 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -39,7 +39,7 @@ objects:
             deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: image-registry.openshift-image-registry.svc:5000/${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000/${PROJECT_NAME}/${NAME}:${VERSION}
               name: client
               ports:
                 - containerPort: 8080

From 8e925bc5f58b5eb048ebdb42745b14b91ae4036d Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 09:21:00 -0800
Subject: [PATCH 27/37] Updated image of the client when pulling image

---
 openshift/client-deploy-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index 0c17b7f00..3d67eb028 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -39,7 +39,7 @@ objects:
             deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: image-registry.openshift-image-registry.svc:5000/${PROJECT_NAME}/${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000/e82e9a-${ENV}/${NAME}:${VERSION}
               name: client
               ports:
                 - containerPort: 8080

From 8b4b34dea9a05a9650dd4331e21216709e9e1f4a Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 09:25:10 -0800
Subject: [PATCH 28/37] UPdated images src for pdf and api

---
 openshift/api-deploy-config.yaml | 2 +-
 openshift/pdf-deploy-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml
index 52d618099..f29d93f36 100644
--- a/openshift/api-deploy-config.yaml
+++ b/openshift/api-deploy-config.yaml
@@ -47,7 +47,7 @@ objects:
             deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: ${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000/e82e9a-${ENV}/${NAME}:${VERSION}
               name: api
               ports:
                 - containerPort: 8080
diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml
index 3f138095c..9ffc279b3 100644
--- a/openshift/pdf-deploy-config.yaml
+++ b/openshift/pdf-deploy-config.yaml
@@ -47,7 +47,7 @@ objects:
             deployment: ${NAME}${SUFFIX}
         spec:
           containers:
-            - image: ${NAME}:${VERSION}
+            - image: image-registry.openshift-image-registry.svc:5000/e82e9a-${ENV}/${NAME}:${VERSION}
               name: pdf
               ports:
                 - containerPort: 8080

From e84993f081a06f56a6afde23b546e920c24f3f6a Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 09:55:15 -0800
Subject: [PATCH 29/37] Corrected the db matadata deployment value

---
 openshift/postgresql-deploy-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 89addfa9f..ddab54d4f 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -17,7 +17,7 @@ objects:
       selector:
         # deploymentconfig: ${NAME}-${ENV}
         matchLabels:
-          deployment: ${NAME}${SUFFIX}
+          deployment: ${NAME}${ENV}
       strategy:
         activeDeadlineSeconds: 21600
         resources: {}
@@ -29,7 +29,7 @@ objects:
           name: ${NAME}-${ENV}
           labels:
             # deploymentconfig: ${NAME}-${ENV}
-            deployment: ${NAME}${SUFFIX}
+            deployment: ${NAME}${ENV}
         spec:
           containers:
             - image: image-registry.openshift-image-registry.svc:5000/e82e9a-tools/${IMAGE_STREAM_TAG}

From 50fa8b4df3ae20174756be6eb680752261c393a9 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:05:54 -0800
Subject: [PATCH 30/37] Corrected the db matadata deployment value

---
 openshift/postgresql-deploy-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index ddab54d4f..dbac5d533 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -9,7 +9,7 @@ objects:
     metadata:
       name: ${NAME}-${ENV}
       labels:
-        deployment: ${NAME}${SUFFIX}
+        deployment: ${NAME}${ENV}
     labels:
       shared: "true"
     spec:

From c2f016d996735c01966f9787c6497285b157e89c Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:08:16 -0800
Subject: [PATCH 31/37] Corrected the db matadata deployment value

---
 openshift/postgresql-deploy-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index dbac5d533..eb46afbd7 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -9,7 +9,7 @@ objects:
     metadata:
       name: ${NAME}-${ENV}
       labels:
-        deployment: ${NAME}${ENV}
+        deployment: ${NAME}-${ENV}
     labels:
       shared: "true"
     spec:
@@ -17,7 +17,7 @@ objects:
       selector:
         # deploymentconfig: ${NAME}-${ENV}
         matchLabels:
-          deployment: ${NAME}${ENV}
+          deployment: ${NAME}-${ENV}
       strategy:
         activeDeadlineSeconds: 21600
         resources: {}

From 0f8a5c0c8a15bfe886f0b1ecee969b7fa5a4ae0a Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:12:13 -0800
Subject: [PATCH 32/37] Corrected the db matadata deployment value

---
 openshift/postgresql-deploy-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index eb46afbd7..ca0a4d3b2 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -29,7 +29,7 @@ objects:
           name: ${NAME}-${ENV}
           labels:
             # deploymentconfig: ${NAME}-${ENV}
-            deployment: ${NAME}${ENV}
+            deployment: ${NAME}-${ENV}
         spec:
           containers:
             - image: image-registry.openshift-image-registry.svc:5000/e82e9a-tools/${IMAGE_STREAM_TAG}

From 55e7c1a3176c84c0afdc749ec512dc61aab9ed66 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:24:58 -0800
Subject: [PATCH 33/37] Deleted existing deployment from openshift and
 retrigger the pipeline

---
 openshift/postgresql-deploy-config.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index ca0a4d3b2..8f507d51c 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -138,7 +138,9 @@ objects:
           port: 5432
           targetPort: 5432
       selector:
-        deployment: ${NAME}-${ENV}
+        # deployment: ${NAME}-${ENV}
+        matchLabels:
+          deployment: ${NAME}-${ENV}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME

From f8958cacd9b7160e3d62b1dd57b597ab302617e7 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 10:54:32 -0800
Subject: [PATCH 34/37] Deleted existing deployment from openshift and
 retrigger the pipeline

---
 openshift/postgresql-deploy-config.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 8f507d51c..3fb25f94f 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -127,10 +127,9 @@ objects:
     apiVersion: v1
     metadata:
       name: ${NAME}-${ENV}
-      labels:
-        deployment: ${NAME}-${ENV}
     labels:
       shared: "true"
+      deployment: ${NAME}-${ENV}
     spec:
       ports:
         - name: postgresql
@@ -138,9 +137,7 @@ objects:
           port: 5432
           targetPort: 5432
       selector:
-        # deployment: ${NAME}-${ENV}
-        matchLabels:
-          deployment: ${NAME}-${ENV}
+        deployment: ${NAME}-${ENV}
 parameters:
   - description: Name of the project (SCHOOLBUS)
     displayName: PROJECT_NAME

From 3ed4a33c50a6a3beb68244ead566999b3074eeb8 Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 11:39:39 -0800
Subject: [PATCH 35/37] Deleted existing deployment from openshift and
 retrigger the pipeline

---
 openshift/postgresql-deploy-config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 3fb25f94f..6e27ca137 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -127,9 +127,9 @@ objects:
     apiVersion: v1
     metadata:
       name: ${NAME}-${ENV}
-    labels:
-      shared: "true"
-      deployment: ${NAME}-${ENV}
+      labels:
+        shared: "true"
+        deployment: ${NAME}-${ENV}
     spec:
       ports:
         - name: postgresql

From aca5c970a4e8f55ef242a14f10386c43e57c347f Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 28 Jan 2025 12:03:35 -0800
Subject: [PATCH 36/37] Deleted existing deployment from openshift and
 retrigger the pipeline

---
 openshift/postgresql-deploy-config.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml
index 6e27ca137..86d5600e7 100644
--- a/openshift/postgresql-deploy-config.yaml
+++ b/openshift/postgresql-deploy-config.yaml
@@ -3,7 +3,6 @@ apiVersion: template.openshift.io/v1
 metadata:
   name: ${PROJECT_NAME}
 objects:
-  # - apiVersion: v1
   - apiVersion: apps/v1
     kind: Deployment
     metadata:

From 29e56162358a04456293b7239ef230787251a10e Mon Sep 17 00:00:00 2001
From: bcgov-brwang <87880048+bcgov-brwang@users.noreply.github.com>
Date: Tue, 11 Feb 2025 08:45:24 -0800
Subject: [PATCH 37/37] 2.0.9: To trigger a new build and deploy

---
 openshift/client-deploy-config.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml
index 3d67eb028..271e0c1f8 100644
--- a/openshift/client-deploy-config.yaml
+++ b/openshift/client-deploy-config.yaml
@@ -159,3 +159,5 @@ parameters:
     name: SOURCE_REPOSITORY_REF
     required: false
     value: ""
+
+