chore(ci): database deploymentConfig to deployment (#76)

bcgov · Oct 11, 2024 · a0aec33 · a0aec33
1 parent 3213b81
commit a0aec33
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/backend/openshift.deploy.yml b/backend/openshift.deploy.yml
@@ -98,10 +98,10 @@ objects:
   apiVersion: v1
   metadata:
     creationTimestamp: 
-    name: gwells-global-config${NAME_SUFFIX}-backend
+    name: gwells-global-config${NAME_SUFFIX}
     labels:
-      appver: gwells${NAME_SUFFIX}-backend
-      app: gwells${NAME_SUFFIX}-backend
+      appver: gwells${NAME_SUFFIX}
+      app: gwells${NAME_SUFFIX}
   data:
     DB_REPLICATE: ${DB_REPLICATE}
     DJANGO_DEBUG: ${DJANGO_DEBUG}

diff --git a/database/postgresql.dc.yml b/database/postgresql.dc.yml
@@ -139,7 +139,7 @@ objects:
           protocol: TCP
           targetPort: 5432
       selector:
-        name: ${DATABASE_SERVICE_NAME}
+        deployment: ${DATABASE_SERVICE_NAME}
       sessionAffinity: None
       type: ClusterIP
     status:
@@ -157,23 +157,25 @@ objects:
         requests:
           storage: ${VOLUME_CAPACITY}
       storageClassName: ${STORAGE_CLASS}
-  - apiVersion: v1
-    kind: DeploymentConfig
+  - apiVersion: apps/v1
+    kind: Deployment
     metadata:
       annotations:
         template.alpha.openshift.io/wait-for-ready: "true"
       name: ${DATABASE_SERVICE_NAME}
     spec:
       replicas: 1
       selector:
-        name: ${DATABASE_SERVICE_NAME}
+        matchLabels:
+          deployment: ${DATABASE_SERVICE_NAME}
       strategy:
         type: Recreate
       template:
         metadata:
           labels:
             name: ${DATABASE_SERVICE_NAME}
             appver: gwells${NAME_SUFFIX}
+            deployment: ${DATABASE_SERVICE_NAME}
         spec:
           containers:
             - capabilities: {}
@@ -223,7 +225,7 @@ objects:
                     secretKeyRef:
                         key: PG_ROOT_PASSWORD
                         name: crunchy-db-credentials
-              image: " "
+              image: "ghcr.io/bcgov/nr-gwells/database:76"
               imagePullPolicy: IfNotPresent
               livenessProbe:
                 failureThreshold: 3
@@ -280,16 +282,4 @@ objects:
             - configMap:
                 name: ${DATABASE_SERVICE_NAME}-setupcfg
               name: ${DATABASE_SERVICE_NAME}-setupcfg
-      triggers:
-        - imageChangeParams:
-            automatic: true
-            containerNames:
-              - postgresql
-            from:
-              kind: ImageStreamTag
-              name: ${IMAGE_STREAM_NAME}:${IMAGE_STREAM_VERSION}
-              namespace: ${IMAGE_STREAM_NAMESPACE}
-            lastTriggeredImage: ""
-          type: ImageChange
-        - type: ConfigChange
     status: {}