Merge pull request #18 from bcgov/dev

Dev
bcgov · Mar 15, 2024 · 4c3be7b · 4c3be7b
2 parents 3f63c3c + 00ac771
commit 4c3be7b
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 18 deletions.
diff --git a/crunchydb/values-uat.yaml b/crunchydb/values-uat.yaml
@@ -1,2 +1,2 @@
 crunchy-postgres:
-  fullnameOverride: strdss-uat
+  fullnameOverride: strdssuat
diff --git a/helm/main/values-dev.yaml b/helm/main/values-dev.yaml
@@ -46,7 +46,7 @@ backend:
   nameOverride: strdss-dev-backend
   fullnameOverride: strdss-dev-backend
   secretName: strdss-secrets-dev
-  dbSecretName: strdss-db-pguser-strdss-db
+  dbSecretName: strdssdev-pguser-strdssdev
   crunchdb: false
 
   # resources:

diff --git a/helm/main/values-prod.yaml b/helm/main/values-prod.yaml
@@ -44,7 +44,7 @@ backend:
   nameOverride: strdss-prod-backend
   fullnameOverride: strdss-prod-backend
   secretName: strdss-secrets-prod
-  dbSecretName: strdss-prod-pguser-strdss-prod
+  dbSecretName: strdssprod-pguser-strdssprod
   crunchdb: true
 
   resources:

diff --git a/helm/main/values-test.yaml b/helm/main/values-test.yaml
@@ -44,16 +44,16 @@ backend:
   nameOverride: strdss-test-backend
   fullnameOverride: strdss-test-backend
   secretName: strdss-secrets-test
-  dbSecretName: strdss-pguser-test
+  dbSecretName: strdsstest-pguser-strdsstest
   crunchdb: false
 
   resources:
     limits:
-      cpu: 50m
-      memory: 100Mi
+      cpu: 200m
+      memory: 150Mi
     requests:
       cpu: 20m
-      memory: 50Mi
+      memory: 100Mi
 
   env:
     'API_HOST': '/api'
diff --git a/helm/main/values-uat.yaml b/helm/main/values-uat.yaml
@@ -44,7 +44,7 @@ backend:
   nameOverride: strdss-uat-backend
   fullnameOverride: strdss-uat-backend
   secretName: strdss-secrets-uat
-  dbSecretName: strdss-uat-pguser-strdss-uat
+  dbSecretName: strdssuat-pguser-strdssuat
   crunchdb: true
 
   resources:

diff --git a/postgres/ReadMe.txt b/postgres/ReadMe.txt
@@ -1,9 +1,9 @@
 oc login
 oc project f4a30d-dev / test
 
-helm install strdss-db-dev bitnami/postgresql -f values-dev.yaml 
+helm install strdssdev bitnami/postgresql -f values-dev.yaml 
 
-helm install strdss-db-test bitnami/postgresql -f values-test.yaml
+helm install strdsstest bitnami/postgresql -f values-test.yaml
 
 Enable PostGIS extension
 https://github.com/bitnami/charts/issues/2830
@@ -15,12 +15,19 @@ Create Extension
   CREATE EXTENSION postgis;
 
 Create Database
-CREATE DATABASE "strdss-dev";
+CREATE DATABASE strdssdev;
 
-CREATE ROLE "strdss-dev" WITH LOGIN PASSWORD '';
-GRANT ALL PRIVILEGES ON DATABASE "strdss-dev" TO "strdss-dev";
+CREATE ROLE strdssdev WITH LOGIN PASSWORD 'MMOv7RVwDS';
 
 
+GRANT ALL PRIVILEGES ON ALL TABLES IN SCHEMA public TO strdssdev;
+
+ALTER DEFAULT PRIVILEGES FOR ROLE postgres GRANT ALL ON TABLES TO strdssdev ;
+ALTER DEFAULT PRIVILEGES FOR ROLE postgres GRANT ALL  ON SEQUENCES TO strdssdev ;
+ALTER DEFAULT PRIVILEGES FOR ROLE postgres GRANT ALL  ON FUNCTIONS TO strdssdev ;
+ALTER DEFAULT PRIVILEGES FOR ROLE postgres GRANT ALL  ON TYPES TO strdssdev ;
+ALTER DEFAULT PRIVILEGES FOR ROLE postgres GRANT ALL  ON SCHEMAS TO strdssdev ;
+
 Create Secret
 
-oc port-forward svc/strdss-dev 5434:5432
+oc port-forward svc/strdssdev 5433:5432
diff --git a/postgres/values-dev.yaml b/postgres/values-dev.yaml
@@ -5,8 +5,15 @@ primary:
     enabled: false
   persistence:
     size: 200Mi
+  resources:
+    limits:
+      cpu: 150m
+      memory: 200Mi
+    requests:
+      cpu: 50m
+      memory: 150Mi
 readReplicas:
   persistence:
     size: 200Mi
-nameOverride: strdss-dev
-fullnameOverride: strdss-dev
+nameOverride: strdssdev
+fullnameOverride: strdssdev
diff --git a/postgres/values-test.yaml b/postgres/values-test.yaml
@@ -5,8 +5,15 @@ primary:
     enabled: false
   persistence:
     size: 200Mi
+  resources:
+    limits:
+      cpu: 150m
+      memory: 200Mi
+    requests:
+      cpu: 50m
+      memory: 150Mi
 readReplicas:
   persistence:
     size: 200Mi
-nameOverride: strdss-test
-fullnameOverride: strdss-test
+nameOverride: strdsstest
+fullnameOverride: strdsstest