Merge pull request #123 from bcgov/chore/terraform

chore: update keycloak log pvc in gold
bcgov · May 31, 2022 · 1d63248 · 1d63248
2 parents 51b9b11 + 8e90ead
commit 1d63248
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 10 deletions.
diff --git a/helm/keycloak/deploy-eb75ad-dev-gold.sh → helm/keycloak/deploy-gold-eb75ad-dev.sh b/helm/keycloak/deploy-eb75ad-dev-gold.sh → helm/keycloak/deploy-gold-eb75ad-dev.sh
@@ -11,4 +11,4 @@ fi
 helm repo add sso-charts https://bcgov.github.io/sso-helm-charts
 helm repo update
 
-helm upgrade --install sso-keycloak sso-charts/sso-keycloak -n eb75ad-dev -f values-eb75ad-dev.yaml --version v1.5.2
+helm upgrade --install sso-keycloak sso-charts/sso-keycloak -n eb75ad-dev -f values-gold-eb75ad-dev.yaml --version v1.6.0
diff --git a/helm/keycloak/deploy-eb75ad-prod-gold.sh → helm/keycloak/deploy-gold-eb75ad-prod.sh b/helm/keycloak/deploy-eb75ad-prod-gold.sh → helm/keycloak/deploy-gold-eb75ad-prod.sh
@@ -11,4 +11,4 @@ fi
 helm repo add sso-charts https://bcgov.github.io/sso-helm-charts
 helm repo update
 
-helm upgrade --install sso-keycloak sso-charts/sso-keycloak -n eb75ad-prod -f values-eb75ad-prod.yaml --version v1.5.2
+helm upgrade --install sso-keycloak sso-charts/sso-keycloak -n eb75ad-prod -f values-gold-eb75ad-prod.yaml --version v1.6.0
diff --git a/helm/keycloak/deploy-eb75ad-test-gold.sh → helm/keycloak/deploy-gold-eb75ad-test.sh b/helm/keycloak/deploy-eb75ad-test-gold.sh → helm/keycloak/deploy-gold-eb75ad-test.sh
@@ -11,4 +11,4 @@ fi
 helm repo add sso-charts https://bcgov.github.io/sso-helm-charts
 helm repo update
 
-helm upgrade --install sso-keycloak sso-charts/sso-keycloak -n eb75ad-test -f values-eb75ad-test.yaml --version v1.5.2
+helm upgrade --install sso-keycloak sso-charts/sso-keycloak -n eb75ad-test -f values-gold-eb75ad-test.yaml --version v1.6.0
diff --git a/helm/keycloak/values-eb75ad-dev.yaml → helm/keycloak/values-gold-eb75ad-dev.yaml b/helm/keycloak/values-eb75ad-dev.yaml → helm/keycloak/values-gold-eb75ad-dev.yaml
@@ -12,6 +12,9 @@ service:
 tls:
   enabled: true
 
+persistentLog:
+  size: 10Gi
+
 resources:
   limits:
     cpu: 2

diff --git a/helm/keycloak/values-eb75ad-prod.yaml → helm/keycloak/values-gold-eb75ad-prod.yaml b/helm/keycloak/values-eb75ad-prod.yaml → helm/keycloak/values-gold-eb75ad-prod.yaml
@@ -12,6 +12,9 @@ service:
 tls:
   enabled: true
 
+persistentLog:
+  size: 15Gi
+
 resources:
   limits:
     cpu: 2

diff --git a/helm/keycloak/values-eb75ad-test.yaml → helm/keycloak/values-gold-eb75ad-test.yaml b/helm/keycloak/values-eb75ad-test.yaml → helm/keycloak/values-gold-eb75ad-test.yaml
@@ -12,6 +12,9 @@ service:
 tls:
   enabled: true
 
+persistentLog:
+  size: 10Gi
+
 resources:
   limits:
     cpu: 2

diff --git a/scripts/role-migrations/groups-clientroles.js b/scripts/role-migrations/groups-clientroles.js
@@ -50,9 +50,9 @@ async function main() {
         // find the role in the target realm to see if already exists, otherwise create one
         let role = await targetAdminClient.clients.findRole({ realm: targetRealm, id: clientId, roleName: name });
         if (role) {
-          console.log(`"${role.name}" already exists in the standard realm.`);
+          console.log(`=====> "${role.name}" already exists in the standard realm.`);
         } else {
-          role = await targetAdminClient.clients.createRole({
+          await targetAdminClient.clients.createRole({
             id: clientId,
             realm: targetRealm,
             name,
@@ -62,8 +62,8 @@ async function main() {
             containerId: clientId,
             attributes: {},
           });
-
-          console.log(`"${role.name}" created in the standard realm.`);
+          role = await targetAdminClient.clients.findRole({ realm: targetRealm, id: clientId, roleName: name });
+          console.log(`=====> "${role.name}" created in the standard realm.`);
         }
 
         // find all members belong to the group in the base realm
@@ -115,15 +115,14 @@ async function main() {
         }
       }
 
+      first = first + max;
       if (count < max) break;
 
       await baseAdminClient.reauth();
       await targetAdminClient.reauth();
-      first = first + max;
-      console.log(`complete ${first} groups`);
     }
 
-    console.log(`${total} groups imported.`);
+    console.log(`=====> ${total} groups imported.`);
     process.exit(0);
   } catch (err) {
     handleError(err);