Merge pull request #184 from bcgov/postgresProdUpgrade

feat: produpgrade
bcgov · Oct 7, 2022 · cb7b0e3 · cb7b0e3
2 parents 58f8082 + 3889f83
commit cb7b0e3
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 32 deletions.
diff --git a/.github/ISSUE_TEMPLATE/silver-custom-gold-custom-request.yml b/.github/ISSUE_TEMPLATE/silver-custom-gold-custom-request.yml
@@ -83,8 +83,8 @@ body:
     attributes:
       value: |
         ## Additional Information ##
-        Please create your IDP via our [Common Hosted Single Sign on App](https://bcgov.github.io/sso-requests) 
-        [How to guide can be found here](https://stackoverflow.developer.gov.bc.ca/questions/864) 
+        Please create your IDP via our [Common Hosted Single Sign on App](https://bcgov.github.io/sso-requests)
+        [How to guide can be found here](https://stackoverflow.developer.gov.bc.ca/questions/864)
   - type: checkboxes
     id: terms
     attributes:

diff --git a/helm/backup-storage/README.md b/helm/backup-storage/README.md
@@ -0,0 +1,17 @@
+These charts can be upgraded using make commands:
+
+`make upgrade NAME=patroni-backup-storage NAMESPACE=<<namespace>>`
+
+To restore from the most recent backup, rsh into the backup pod in the namespace in question and run:
+
+**dev silver production**:
+
+`./backup.sh -r postgres=sso-pgsql-dev-11-patroni:5432/rhsso`
+
+**test silver production**:
+
+`./backup.sh -r postgres=sso-pgsql-test-11-patroni:5432/keycloak`
+
+**prod silver production**:
+
+`./backup.sh -r postgres=sso-pgsql-prod-11-patroni:5432/rhsso`
diff --git a/helm/backup-storage/values-3d5c3f-dev-patroni-backup-storage.yaml b/helm/backup-storage/values-3d5c3f-dev-patroni-backup-storage.yaml
@@ -1,8 +1,3 @@
-# The command to restore the latest backup is:
-# ./backup.sh -r postgres=sso-pgsql-master-dev:5432/rhsso
-# The command to update the backup in sandbox dev is:
-# make upgrade NAME=patroni-backup-storage NAMESPACE=3d5c3f-dev
-
 nameOverride: "sso-backup-storage"
 fullnameOverride: "sso-backup-storage"
 
@@ -17,6 +12,11 @@ db:
   usernameKey: app-db-username
   passwordKey: app-db-password
 
+persistence:
+  backup:
+    size: 6Gi
+  verification:
+    size: 3Gi
 env:
   DATABASE_SERVICE_NAME:
     value: sso-pgsql-dev-11-patroni

diff --git a/helm/backup-storage/values-6d70e7-dev-patroni-backup-storage.yaml b/helm/backup-storage/values-6d70e7-dev-patroni-backup-storage.yaml
@@ -1,8 +1,3 @@
-# The command to restore the latest backup is:
-# ./backup.sh -r postgres=sso-pgsql-master-dev:5432/rhsso
-# The command to update the backup in sandbox dev is:
-# make upgrade NAME=patroni-backup-storage NAMESPACE=6d70e7-dev
-
 nameOverride: "sso-backup-storage"
 fullnameOverride: "sso-backup-storage"
 

diff --git a/helm/backup-storage/values-6d70e7-prod-patroni-backup-storage.yaml b/helm/backup-storage/values-6d70e7-prod-patroni-backup-storage.yaml
@@ -1,24 +1,24 @@
-# The command to restore the latest backup is:
-# ./backup.sh -r postgres=sso-pgsql-master-dev:5432/rhsso
-# The command to update the backup in sandbox dev is:
-# make upgrade NAME=patroni-backup-storage NAMESPACE=6d70e7-prod
-
 nameOverride: "sso-backup-storage"
 fullnameOverride: "sso-backup-storage"
 
 backupConfig: |
-  postgres=sso-pgsql-master-prod:5432/rhsso
+  postgres=sso-pgsql-prod-11-patroni:5432/rhsso
 
   0 1 * * * default ./backup.sh -s
   0 4 * * * default ./backup.sh -s -v all
 db:
-  secretName: sso-pgsql-prod
-  usernameKey: app-db-username
-  passwordKey: app-db-password
-
+  secretName: patroni-11-prod-secret
+  usernameKey: username
+  passwordKey: password
+
+persistence:
+  backup:
+    size: 42Gi
+  verification:
+    size: 10Gi
 env:
   DATABASE_SERVICE_NAME:
-    value: sso-pgsql-master-prod
+    value: sso-pgsql-prod-11-patroni
 
   ENVIRONMENT_FRIENDLY_NAME:
     value: "Silver SSO production-prod DB Backups"

diff --git a/helm/backup-storage/values-6d70e7-test-patroni-backup-storage.yaml b/helm/backup-storage/values-6d70e7-test-patroni-backup-storage.yaml
@@ -1,8 +1,3 @@
-# The command to restore the latest backup is:
-# ./backup.sh -r postgres=sso-pgsql-master-dev:5432/rhsso
-# The command to update the backup in sandbox dev is:
-# make upgrade NAME=patroni-backup-storage NAMESPACE=6d70e7-test
-
 nameOverride: "sso-backup-storage"
 fullnameOverride: "sso-backup-storage"
 

diff --git a/helm/keycloak/values-6d70e7-prod.yaml b/helm/keycloak/values-6d70e7-prod.yaml
@@ -10,12 +10,15 @@ service:
   port: 8443
 
 postgres:
-  host: sso-pgsql-master-prod
+  host: sso-pgsql-prod-11-patroni
   database: rhsso
   credentials:
-    secret: sso-pgsql-prod
-    usernameKey: app-db-username
-    passwordKey: app-db-password
+    secret: patroni-11-prod-secret
+    usernameKey: username
+    passwordKey: password
+
+persistentLog:
+  storageClassSize: 15Gi
 
 tls:
   enabled: true

diff --git a/helm/silver-patroni/values-6d70e7-prod.yaml b/helm/silver-patroni/values-6d70e7-prod.yaml
@@ -0,0 +1,17 @@
+replicaCount: 3
+
+image:
+  repository: ghcr.io/bcgov/spilo-14
+  tag: 2.1-p5
+  pullPolicy: IfNotPresent
+
+imagePullSecrets:
+  - name: gh-registry-config
+
+postgresMajorVersion: 11
+
+persistentVolume:
+  size: 30Gi
+
+podDisruptionBudget:
+  enabled: true