From e4fa3b5a3aa510ddd8d9d0407c78c3e643e068eb Mon Sep 17 00:00:00 2001 From: Om Mishra <32200996+mishraomp@users.noreply.github.com> Date: Thu, 2 May 2024 10:20:51 -0700 Subject: [PATCH] chore(CI): remove postgres as it is not currently being used --- charts/nr-omrr-transparency/Chart.yaml | 8 -- charts/nr-omrr-transparency/values.yaml | 140 +----------------------- 2 files changed, 1 insertion(+), 147 deletions(-) diff --git a/charts/nr-omrr-transparency/Chart.yaml b/charts/nr-omrr-transparency/Chart.yaml index 48bb0a4a..852f9ba2 100644 --- a/charts/nr-omrr-transparency/Chart.yaml +++ b/charts/nr-omrr-transparency/Chart.yaml @@ -24,14 +24,6 @@ version: 0.1.0 # It is recommended to use it with quotes. appVersion: "1.16.0" -dependencies: - - - name: postgresql - condition: bitnami-pg.enabled - version: 15.2.8 - repository: https://charts.bitnami.com/bitnami - alias: bitnami-pg - maintainers: - name: Om Mishra email: omprakash.2.mishra@gov.bc.ca diff --git a/charts/nr-omrr-transparency/values.yaml b/charts/nr-omrr-transparency/values.yaml index 6f88fac4..04eb0605 100644 --- a/charts/nr-omrr-transparency/values.yaml +++ b/charts/nr-omrr-transparency/values.yaml @@ -25,7 +25,7 @@ global: #-- domain of the application, it is required, apps.silver.devops.gov.bc.ca for silver cluster and apps.devops.gov.bc.ca for gold cluster domain: "apps.silver.devops.gov.bc.ca" # it is apps.gold.devops.gov.bc.ca for gold cluster #-- the database Alias gives a nice way to switch to different databases, crunchy, patroni ... etc. - databaseAlias: bitnami-pg + #-- the components of the application, backend. backend: #-- enable or disable backend @@ -98,141 +98,3 @@ frontend: enabled: false # enable it in PRODUCTION for having pod disruption budget. minAvailable: 1 # the minimum number of pods that must be available during the disruption budget. -crunchy: # enable it for TEST and PROD, for PR based pipelines simply use single postgres - enabled: false - - crunchyImage: artifacts.developer.gov.bc.ca/bcgov-docker-local/crunchy-postgres-gis:ubi8-15.2-3.3-0 - - postgresVersion: 15 - postGISVersion: '3.3' - imagePullPolicy: Always - instances: - name: ha # high availability - replicas: 1 # 2 or 3 for high availability in TEST and PROD. - metadata: - annotations: - prometheus.io/scrape: 'true' - prometheus.io/port: '9187' - dataVolumeClaimSpec: - storage: 120Mi - storageClassName: netapp-block-standard - requests: - cpu: 25m - memory: 256Mi - limits: - cpu: 100m - memory: 512Mi - replicaCertCopy: - requests: - cpu: 1m - memory: 32Mi - limits: - cpu: 50m - memory: 64Mi - - pgBackRest: - enabled: false - image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default - retention: "1" # Ideally a larger number such as 30 backups/days - # If retention-full-type set to 'count' then the oldest backups will expire when the number of backups reach the number defined in retention - # If retention-full-type set to 'time' then the number defined in retention will take that many days worth of full backups before expiration - retentionFullType: count - repos: - schedules: - full: 0 8 * * * - incremental: 0 0,4,12,16,20 * * * - volume: - accessModes: "ReadWriteOnce" - storage: 64Mi - storageClassName: netapp-file-backup - repoHost: - requests: - cpu: 1m - memory: 64Mi - limits: - cpu: 50m - memory: 128Mi - sidecars: - requests: - cpu: 1m - memory: 64Mi - limits: - cpu: 50m - memory: 128Mi - - patroni: - postgresql: - pg_hba: "host all all 0.0.0.0/0 md5" - parameters: - shared_buffers: 16MB # default is 128MB; a good tuned default for shared_buffers is 25% of the memory allocated to the pod - wal_buffers: "64kB" # this can be set to -1 to automatically set as 1/32 of shared_buffers or 64kB, whichever is larger - min_wal_size: 32MB - max_wal_size: 64MB # default is 1GB - max_slot_wal_keep_size: 128MB # default is -1, allowing unlimited wal growth when replicas fall behind - - proxy: - pgBouncer: - image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default - replicas: 1 - requests: - cpu: 1m - memory: 64Mi - limits: - cpu: 50m - memory: 128Mi - - # Postgres Cluster resource values: - pgmonitor: - enabled: false - exporter: - image: # it's not necessary to specify an image as the images specified in the Crunchy Postgres Operator will be pulled by default - requests: - cpu: 1m - memory: 64Mi - limits: - cpu: 50m - memory: 128Mi - -bitnami-pg: - enabled: false - image: - registry: ghcr.io - repository: bcgov/nr-containers/bitnami/postgresql - tag: 15.6.0 - auth: - existingSecret: '{{ .Release.Name }}' - username: omrr - database: omrr - shmVolume: - enabled: false - backup: - enabled: false - cronjob: - containerSecurityContext: { } - podSecurityContext: - enabled: false - storage: - size: 200Mi - primary: - persistence: - enabled: true - storageClass: netapp-block-standard - accessModes: - - ReadWriteOnce - size: 100Mi - containerSecurityContext: - enabled: false - podSecurityContext: - enabled: false - initdb: - scripts: # remove the below script, if POSTGIS is not required. - postgis.sh: | - #!/bin/sh - PGPASSWORD=$POSTGRES_PASSWORD psql -U postgres -d postgres -c "CREATE EXTENSION postgis;" - resources: - requests: - cpu: 30m - memory: 100Mi - limits: - cpu: 90m - memory: 250Mi