Merge pull request #536 from bcgov/yj

Yj

Author: ychung-mot

README.md

@@ -1,4 +1,5 @@
 # House-Policy-STRDSS
+
 Short Term Rental Data Sharing System (STRDSS)
 
 ## Create Release Tag Procedure

backup-container/README.md

@@ -6,15 +6,10 @@ Short Term Rental Data Sharing System (STRDSS) is using an customized version of
 
 ### 1. [Dockerfile](./src/docker/Dockerfile)
 
-Installed postgis extension
+Docker image to postgresql-16:16
 
 ```docker
-RUN dnf install -y curl util-linux postgis && \
-    curl https://dl.min.io/client/mc/release/linux-amd64/mc -o /usr/bin/mc && \
-    chmod +x /usr/bin/mc /usr/bin/go-crond && \
-    dnf clean all && \
-    rm -rf /var/cache/dnf && \
-    echo $TZ > /etc/timezone
+FROM --platform=linux/amd64 quay.io/fedora/postgresql-16:16
 ```
 
 ### 2. [backup.postgres.plugin](./src/docker/backup.postgres.plugin)
@@ -36,17 +31,6 @@ Set owner
   fi
 ```
 
-Added POSTGRESQL_EXTENSIONS for verification
-
-```sh
-# Start a local PostgreSql instance
-POSTGRESQL_DATABASE=$(getDatabaseName "${_databaseSpec}") \
-POSTGRESQL_USER=$(getDatabaseName "${_databaseSpec}") \
-POSTGRESQL_PASSWORD=$(getPassword "${_databaseSpec}") \
-POSTGRESQL_EXTENSIONS=postgis \
-run-postgresql >/dev/null 2>&1 &
-```
-
 ## Docker build and push to the Artifactory
 
 cd into [docker](./src/docker/)

backup-container/helm/backup-storage/values.yaml

@@ -5,7 +5,7 @@
 image:
   repository: artifacts.developer.gov.bc.ca/sf4a-strdss/backup-container
   pullPolicy: Always
-  tag: latest
+  tag: 16
 
 imagePullSecrets:
   - name: jf-rg-secret
@@ -16,7 +16,6 @@ backupConfig: |
   postgres=patroni-postgresql-gw:5432/gw
 
   0 1 * * * default ./backup.sh -s
-  0 4 * * * default ./backup.sh -s -v all
 
 config:
   []
@@ -32,12 +31,6 @@ persistence:
     mountPath: /backups/
     storageClassName: netapp-block-standard
     storageAccessMode: ReadWriteOnce
-  verification:
-    size: 2Gi
-    mountPath: /var/lib/pgsql/data
-    storageClassName: netapp-block-standard
-    storageAccessMode: ReadWriteOnce
-
 db:
   secretName: "patroni"
   usernameKey: "username-superuser"

backup-container/helm/dev-values.yaml

@@ -9,27 +9,23 @@ global:
 nameOverride: strdssdev-backup
 fullnameOverride: strdssdev-backup
 
+dbService: strdssdev
+
 backupConfig: |
   postgres=strdssdev:5432/strdssdev
 
   0 1 * * * default ./backup.sh -s
-  0 4 * * * default ./backup.sh -s -v all
 
 db:
   secretName: strdssdev
   passwordKey: postgres-password
 
 persistence:
   backup:
-    size: 700Mi
+    size: 1Gi
     mountPath: /backups/
     storageClassName: netapp-file-backup
     storageAccessMode: ReadWriteOnce
-  verification:
-    size: 512Mi
-    mountPath: /var/lib/pgsql/data
-    storageClassName: netapp-block-standard
-    storageAccessMode: ReadWriteOnce
 
 env:
   DATABASE_SERVICE_NAME:
@@ -40,4 +36,4 @@ env:
     value: "dev"
 backup-storage:
   labels:
-    DataClass: "Medium"
+    DataClass: "Medium"

backup-container/helm/prod-values.yaml

@@ -9,27 +9,23 @@ global:
 nameOverride: strdssprod-backup
 fullnameOverride: strdssprod-backup
 
+dbService: strdssprod
+
 backupConfig: |
   postgres=strdssprod:5432/strdssprod
 
   0 1 * * * default ./backup.sh -s
-  0 4 * * * default ./backup.sh -s -v all
 
 db:
   secretName: strdssprod
   passwordKey: postgres-password
 
 persistence:
   backup:
-    size: 700Mi
+    size: 1Gi
     mountPath: /backups/
     storageClassName: netapp-file-backup
     storageAccessMode: ReadWriteOnce
-  verification:
-    size: 512Mi
-    mountPath: /var/lib/pgsql/data
-    storageClassName: netapp-block-standard
-    storageAccessMode: ReadWriteOnce
 
 env:
   DATABASE_SERVICE_NAME:

backup-container/helm/uat-values.yaml

@@ -9,27 +9,23 @@ global:
 nameOverride: strdssuat-backup
 fullnameOverride: strdssuat-backup
 
+dbService: strdssuat
+
 backupConfig: |
   postgres=strdssuat:5432/strdssuat
 
   0 1 * * * default ./backup.sh -s
-  0 4 * * * default ./backup.sh -s -v all
 
 db:
   secretName: strdssuat
   passwordKey: postgres-password
 
 persistence:
   backup:
-    size: 700Mi
+    size: 1Gi
     mountPath: /backups/
     storageClassName: netapp-file-backup
     storageAccessMode: ReadWriteOnce
-  verification:
-    size: 512Mi
-    mountPath: /var/lib/pgsql/data
-    storageClassName: netapp-block-standard
-    storageAccessMode: ReadWriteOnce
 
 env:
   DATABASE_SERVICE_NAME:

backup-container/src/docker/Dockerfile

@@ -1,5 +1,5 @@
 # This image provides a postgres installation from which to run backups
-FROM --platform=linux/amd64 quay.io/fedora/postgresql-15:15
+FROM --platform=linux/amd64 quay.io/fedora/postgresql-16:16
 
 # Change timezone to PST for convenience
 ENV TZ=America/Los_Angeles
@@ -22,7 +22,7 @@ ADD https://github.com/$SOURCE_REPO/go-crond/releases/download/$GOCROND_VERSION/
 
 USER root
 
-RUN dnf install -y curl util-linux postgis && \
+RUN dnf install -y curl util-linux && \
     curl https://dl.min.io/client/mc/release/linux-amd64/mc -o /usr/bin/mc && \
     chmod +x /usr/bin/mc /usr/bin/go-crond && \
     dnf clean all && \

backup-container/src/docker/backup.postgres.plugin

@@ -143,7 +143,6 @@ function onStartServer(){
     POSTGRESQL_DATABASE=$(getDatabaseName "${_databaseSpec}") \
     POSTGRESQL_USER=$(getDatabaseName "${_databaseSpec}") \
     POSTGRESQL_PASSWORD=$(getPassword "${_databaseSpec}") \
-    POSTGRESQL_EXTENSIONS=postgis \
     run-postgresql >/dev/null 2>&1 &
   )
 }

postgres/README.md

@@ -1,24 +1,24 @@
 # Postgres
 
-Short Term Rental Data Sharing System (STRDSS) is using bitnami/postgresql with chart version 12.12.10
+Short Term Rental Data Sharing System (STRDSS) is using bitnami/postgresql with chart version 15.5.20
 
 ## List Helm Chart Versions
 
 ```sh
 helm search repo bitnami/postgresql --versions
-helm show values bitnami/postgresql --version 12.12.10
+helm show values bitnami/postgresql --version 15.5.20
 ```
 
 ## Get Image Version
 
 ```sh
-helm show values bitnami/postgresql --version 12.12.10  | yq eval '.image' -
+helm show values bitnami/postgresql --version 15.5.20  | yq eval '.image' -
 ```
 
 ## Helm deploy
 
 ```sh
-helm upgrade --install strdssdev bitnami/postgresql -f values-dev.yaml --version 12.12.10
+helm upgrade --install strdssdev bitnami/postgresql -f values-dev.yaml --version 15.5.20
 ```
 
 ## Database Setup

server/StrDss.Service/Bceid/BceidApi.cs

@@ -94,6 +94,8 @@ private void RefreshCache(object source, ElapsedEventArgs e)
 
             request.onlineServiceId = _client.Osid;
 
+            _client.Endpoint.EndpointBehaviors.Add(new LoggingEndpointBehavior());
+
             _logger.LogInformation($"[Egress] Calling BCeID web service: {_client.Endpoint.Address}");
 
             var response = await _client.getAccountDetailAsync(request);