From 170b88ae37b88010b77e21f7807d280aa836d308 Mon Sep 17 00:00:00 2001 From: Ionwyn Sean Date: Wed, 9 Apr 2025 13:29:11 -0700 Subject: [PATCH 1/4] Upgrade psql to 16.8 --- README.md | 2 +- openshift/api-build-config.yaml | 4 ++-- openshift/postgresql-deploy-config.yaml | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 4ebeb0190..186602e21 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ The application is being developed as an open source solution. - .Net 7 - Node.JS v13.7.0 or newer -- PostgreSQL 10 +- PostgreSQL 16 ## Dependencies diff --git a/openshift/api-build-config.yaml b/openshift/api-build-config.yaml index a0986f77a..d243a620d 100644 --- a/openshift/api-build-config.yaml +++ b/openshift/api-build-config.yaml @@ -29,7 +29,7 @@ objects: - apiVersion: v1 kind: ImageStream metadata: - name: postgresql-10-rhel8 + name: postgresql-16-rhel8 labels: shared: "true" spec: @@ -39,7 +39,7 @@ objects: - annotations: null from: kind: DockerImage - name: registry.redhat.io/rhel8/postgresql-10 + name: registry.redhat.io/rhel8/postgresql-16:1-42.1741813436 name: "1" referencePolicy: type: Local diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml index 86d5600e7..6037b4f5b 100644 --- a/openshift/postgresql-deploy-config.yaml +++ b/openshift/postgresql-deploy-config.yaml @@ -38,17 +38,17 @@ objects: - name: POSTGRESQL_USER valueFrom: secretKeyRef: - name: ${NAME}-${ENV} + name: sbi-db-dev key: database-user - name: POSTGRESQL_PASSWORD valueFrom: secretKeyRef: - name: ${NAME}-${ENV} + name: sbi-db-dev key: database-password - name: POSTGRESQL_ADMIN_PASSWORD valueFrom: secretKeyRef: - name: ${NAME}-${ENV} + name: sbi-db-dev key: admin-password - name: POSTGRESQL_DATABASE value: ${POSTGRESQL_DATABASE_NAME} @@ -96,7 +96,7 @@ objects: volumes: - name: "${NAME}-${ENV}-data" persistentVolumeClaim: - claimName: ${NAME}-${ENV}-pvc + claimName: sb-db-dev-psql17-pvc test: false triggers: - type: ConfigChange @@ -147,7 +147,7 @@ parameters: displayName: Name description: The name assigned to all of the OpenShift resources associated to the PostgreSQL instance. required: true - value: db + value: db16 - description: A name suffix used for all objects displayName: Suffix name: SUFFIX @@ -166,7 +166,7 @@ parameters: - description: ImageStreamTag displayName: ImageStreamTag name: IMAGE_STREAM_TAG - value: "postgresql-10-rhel8:1" + value: "postgresql-16-rhel8:1" - name: POSTGRESQL_DATABASE_NAME displayName: PostgreSQL Database Name description: The name of the PostgreSQL database. From 76b644c874082ddc6b8e7f23539d9e36277af225 Mon Sep 17 00:00:00 2001 From: Ionwyn Sean Date: Wed, 9 Apr 2025 13:31:04 -0700 Subject: [PATCH 2/4] Update postgresql-deploy-config.yaml --- 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 6037b4f5b..5cdc6c065 100644 --- a/openshift/postgresql-deploy-config.yaml +++ b/openshift/postgresql-deploy-config.yaml @@ -147,7 +147,7 @@ parameters: displayName: Name description: The name assigned to all of the OpenShift resources associated to the PostgreSQL instance. required: true - value: db16 + value: db - description: A name suffix used for all objects displayName: Suffix name: SUFFIX From f2c95547c0e500a4aab0f67421fd5a5c2667e111 Mon Sep 17 00:00:00 2001 From: Ionwyn Sean Date: Wed, 9 Apr 2025 13:45:17 -0700 Subject: [PATCH 3/4] Remove triggers from Deployment object --- openshift/api-deploy-config.yaml | 10 ---------- openshift/client-deploy-config.yaml | 10 ---------- openshift/pdf-deploy-config.yaml | 10 ---------- openshift/postgresql-deploy-config.yaml | 11 ----------- 4 files changed, 41 deletions(-) diff --git a/openshift/api-deploy-config.yaml b/openshift/api-deploy-config.yaml index f29d93f36..f7c9ea965 100644 --- a/openshift/api-deploy-config.yaml +++ b/openshift/api-deploy-config.yaml @@ -144,16 +144,6 @@ objects: defaultMode: 420 name: api-appsettings-${ENV} test: false - triggers: - - imageChangeParams: - automatic: true - containerNames: - - api - from: - kind: ImageStreamTag - name: ${NAME}:${VERSION} - type: ImageChange - - type: ConfigChange - apiVersion: v1 #service: api kind: Service metadata: diff --git a/openshift/client-deploy-config.yaml b/openshift/client-deploy-config.yaml index 271e0c1f8..da8c3b27f 100644 --- a/openshift/client-deploy-config.yaml +++ b/openshift/client-deploy-config.yaml @@ -74,16 +74,6 @@ objects: - name: APP_NAME value: ${PROJECT_NAME} test: false - triggers: - - imageChangeParams: - automatic: true - containerNames: - - client - from: - kind: ImageStreamTag - name: ${NAME}:${VERSION} - type: ImageChange - - type: ConfigChange - apiVersion: v1 kind: Service metadata: diff --git a/openshift/pdf-deploy-config.yaml b/openshift/pdf-deploy-config.yaml index 9ffc279b3..8eeff3210 100644 --- a/openshift/pdf-deploy-config.yaml +++ b/openshift/pdf-deploy-config.yaml @@ -72,16 +72,6 @@ objects: path: "/" port: 8080 test: false - triggers: - - imageChangeParams: - automatic: true - containerNames: - - pdf - from: - kind: ImageStreamTag - name: ${NAME}:${VERSION} - type: ImageChange - - type: ConfigChange - apiVersion: v1 #service: pdf kind: Service metadata: diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml index 5cdc6c065..e13eb5912 100644 --- a/openshift/postgresql-deploy-config.yaml +++ b/openshift/postgresql-deploy-config.yaml @@ -98,17 +98,6 @@ objects: persistentVolumeClaim: claimName: sb-db-dev-psql17-pvc test: false - triggers: - - type: ConfigChange - - imageChangeParams: - automatic: true - containerNames: - - ${NAME}-${ENV} - from: - kind: ImageStreamTag - name: ${IMAGE_STREAM_TAG} - namespace: e82e9a-tools - type: ImageChange - kind: PersistentVolumeClaim apiVersion: v1 metadata: From e870174087411107de5ce28d43333188aa046f5f Mon Sep 17 00:00:00 2001 From: Ionwyn Sean Date: Thu, 10 Apr 2025 15:46:21 -0700 Subject: [PATCH 4/4] Update postgresql-deploy-config.yaml --- openshift/postgresql-deploy-config.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openshift/postgresql-deploy-config.yaml b/openshift/postgresql-deploy-config.yaml index e13eb5912..5d3774cdd 100644 --- a/openshift/postgresql-deploy-config.yaml +++ b/openshift/postgresql-deploy-config.yaml @@ -38,17 +38,17 @@ objects: - name: POSTGRESQL_USER valueFrom: secretKeyRef: - name: sbi-db-dev + name: ${NAME}-${ENV} key: database-user - name: POSTGRESQL_PASSWORD valueFrom: secretKeyRef: - name: sbi-db-dev + name: ${NAME}-${ENV} key: database-password - name: POSTGRESQL_ADMIN_PASSWORD valueFrom: secretKeyRef: - name: sbi-db-dev + name: ${NAME}-${ENV} key: admin-password - name: POSTGRESQL_DATABASE value: ${POSTGRESQL_DATABASE_NAME} @@ -96,7 +96,7 @@ objects: volumes: - name: "${NAME}-${ENV}-data" persistentVolumeClaim: - claimName: sb-db-dev-psql17-pvc + claimName: ${NAME}-${ENV}-psql16-pvc test: false - kind: PersistentVolumeClaim apiVersion: v1