Merge pull request #105 from bcgov/gold-cred-1130

Gold cred 1130
bcgov · Apr 12, 2022 · d3eae59 · d3eae59
2 parents 4e8504f + 0d70b1d
commit d3eae59
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 25 deletions.
diff --git a/helm/keycloak/values-c6af30-prod.yaml b/helm/keycloak/values-c6af30-prod.yaml
@@ -1,6 +1,8 @@
-replicaCount: 1
+replicaCount: 2
 
 project: sso-keycloak
+nameOverride: sso-keycloak
+fullnameOverride: sso-keycloak
 
 image:
  tag: 7.5-9-rc.2
@@ -11,10 +13,11 @@ service:
 
 postgres:
  host: sso-patroni
+ database: ssokeycloak
  credentials:
  secret: sso-patroni
- usernameKey: username-superuser
- passwordKey: password-superuser
+ usernameKey: username-appuser
+ passwordKey: password-appuser
 
 tls:
  enabled: true

diff --git a/helm/keycloak/values-c6af30-test.yaml b/helm/keycloak/values-c6af30-test.yaml
@@ -1,6 +1,8 @@
-replicaCount: 1
+replicaCount: 3
 
 project: sso-keycloak
+nameOverride: sso-keycloak
+fullnameOverride: sso-keycloak
 
 image:
  tag: 7.5-9-rc.2
@@ -11,18 +13,19 @@ service:
 
 postgres:
  host: sso-patroni
+ database: ssokeycloak
  credentials:
  secret: sso-patroni
- usernameKey: username-superuser
- passwordKey: password-superuser
+ usernameKey: username-appuser
+ passwordKey: password-appuser
 
 tls:
  enabled: true
 
 resources:
  limits:
  cpu: 1
- memory: 1Gi
+ memory: 2Gi
  requests:
  cpu: 500m
  memory: 1Gi
diff --git a/helm/keycloak/values-eb75ad-dev.yaml b/helm/keycloak/values-eb75ad-dev.yaml
@@ -1,6 +1,8 @@
 replicaCount: 5
 
 project: sso-keycloak
+nameOverride: sso-keycloak
+fullnameOverride: sso-keycloak
 
 image:
  tag: 7.5-9-rc.2
@@ -11,10 +13,11 @@ service:
 
 postgres:
  host: sso-patroni
+ database: ssokeycloak
  credentials:
  secret: sso-patroni
- usernameKey: username-superuser
- passwordKey: password-superuser
+ usernameKey: username-appuser
+ passwordKey: password-appuser
 
 tls:
  enabled: true

diff --git a/helm/keycloak/values-eb75ad-prod.yaml b/helm/keycloak/values-eb75ad-prod.yaml
@@ -1,6 +1,8 @@
 replicaCount: 5
 
 project: sso-keycloak
+nameOverride: sso-keycloak
+fullnameOverride: sso-keycloak
 
 image:
  tag: 7.5-9-rc.2
@@ -11,10 +13,11 @@ service:
 
 postgres:
  host: sso-patroni
+ database: ssokeycloak
  credentials:
  secret: sso-patroni
- usernameKey: username-superuser
- passwordKey: password-superuser
+ usernameKey: username-appuser
+ passwordKey: password-appuser
 
 tls:
  enabled: true

diff --git a/helm/keycloak/values-eb75ad-test.yaml b/helm/keycloak/values-eb75ad-test.yaml
@@ -1,6 +1,8 @@
 replicaCount: 5
 
 project: sso-keycloak
+nameOverride: sso-keycloak
+fullnameOverride: sso-keycloak
 
 image:
  tag: 7.5-9-rc.2
@@ -11,10 +13,11 @@ service:
 
 postgres:
  host: sso-patroni
+ database: ssokeycloak
  credentials:
  secret: sso-patroni
- usernameKey: username-superuser
- passwordKey: password-superuser
+ usernameKey: username-appuser
+ passwordKey: password-appuser
 
 tls:
  enabled: true

diff --git a/helm/patroni/values-c6af30-dev-sso-patroni.yaml b/helm/patroni/values-c6af30-dev-sso-patroni.yaml
@@ -1,9 +1,11 @@
 replicaCount: 3
 
 image:
- repository: gcr.io/ggl-cas-storage/cas-postgres
+ # https://github.com/zalando/spilo/releases/tag/2.1-p1
+ # RH SSO JDBC is enable to connect to PostgreSQL 14
+ repository: registry.opensource.zalan.do/acid/spilo-13
  pullPolicy: Always
- tag: "0.3.0"
+ tag: 2.1-p1
 
 project: sso-keycloak
 nameOverride: sso-patroni
@@ -33,9 +35,3 @@ kubernetes:
  enable: true
 walE:
  enable: false
-
-# auth:
-# existingSecret: sso-patroni
-# superuser:
-# username: username-superuser
-# password: password-superuser
diff --git a/helm/patroni/values-c6af30-prod-sso-patroni.yaml b/helm/patroni/values-c6af30-prod-sso-patroni.yaml
@@ -1,9 +1,11 @@
 replicaCount: 3
 
 image:
- repository: gcr.io/ggl-cas-storage/cas-postgres
+ # https://github.com/zalando/spilo/releases/tag/2.1-p1
+ # RH SSO JDBC is enable to connect to PostgreSQL 14
+ repository: registry.opensource.zalan.do/acid/spilo-13
  pullPolicy: Always
- tag: "0.3.0"
+ tag: 2.1-p1
 
 project: sso-keycloak
 nameOverride: sso-patroni
@@ -12,6 +14,10 @@ fullnameOverride: sso-patroni
 auth:
  existingSecret: sso-patroni
 
+appdb:
+ create: true
+ dbname: ssokeycloak
+
 env:
  ALLOW_NOSSL: "true"
 

diff --git a/helm/patroni/values-c6af30-test-sso-patroni.yaml b/helm/patroni/values-c6af30-test-sso-patroni.yaml
@@ -1,9 +1,11 @@
 replicaCount: 3
 
 image:
- repository: gcr.io/ggl-cas-storage/cas-postgres
+ # https://github.com/zalando/spilo/releases/tag/2.1-p1
+ # RH SSO JDBC is enable to connect to PostgreSQL 14
+ repository: registry.opensource.zalan.do/acid/spilo-13
  pullPolicy: Always
- tag: "0.3.0"
+ tag: 2.1-p1
 
 project: sso-keycloak
 nameOverride: sso-patroni
@@ -12,6 +14,10 @@ fullnameOverride: sso-patroni
 auth:
  existingSecret: sso-patroni
 
+appdb:
+ create: true
+ dbname: ssokeycloak
+
 env:
  ALLOW_NOSSL: "true"
 

diff --git a/helm/patroni/values-eb75ad-dev-sso-patroni.yaml b/helm/patroni/values-eb75ad-dev-sso-patroni.yaml
@@ -14,6 +14,10 @@ fullnameOverride: sso-patroni
 auth:
  existingSecret: sso-patroni
 
+appdb:
+ create: true
+ dbname: ssokeycloak
+
 env:
  ALLOW_NOSSL: "true"
 

diff --git a/helm/patroni/values-eb75ad-prod-sso-patroni.yaml b/helm/patroni/values-eb75ad-prod-sso-patroni.yaml
@@ -14,6 +14,10 @@ fullnameOverride: sso-patroni
 auth:
  existingSecret: sso-patroni
 
+appdb:
+ create: true
+ dbname: ssokeycloak
+
 env:
  ALLOW_NOSSL: "true"
 

diff --git a/helm/patroni/values-eb75ad-test-sso-patroni.yaml b/helm/patroni/values-eb75ad-test-sso-patroni.yaml
@@ -14,6 +14,10 @@ fullnameOverride: sso-patroni
 auth:
  existingSecret: sso-patroni
 
+appdb:
+ create: true
+ dbname: ssokeycloak
+
 env:
  ALLOW_NOSSL: "true"