Merge pull request #133 from bcgov/task/Rh1KcuJL

feat: oc global deployer for each cluster
bcgov · Jun 29, 2022 · 6971e9c · 6971e9c
2 parents 0d4bea2 + 2f9d074
commit 6971e9c
Show file tree

Hide file tree

Showing 15 changed files with 54 additions and 178 deletions.
diff --git a/helm/kc-cron-job/Chart.yaml b/helm/kc-cron-job/Chart.yaml
@@ -2,3 +2,7 @@ apiVersion: v1
 name: kc-cron-job
 description: "Helm chart for CronJob to collect Keycloak active sessions"
 version: 0.1.1
+dependencies:
+  - name: patroni
+    version: 1.5.1
+    repository: https://bcgov.github.io/sso-helm-charts
diff --git a/helm/kc-cron-job/requirements.lock b/helm/kc-cron-job/requirements.lock
@@ -0,0 +1,6 @@
+dependencies:
+- name: patroni
+  repository: https://bcgov.github.io/sso-helm-charts
+  version: 1.5.1
+digest: sha256:df1184647e069e0affc7f3bf829dc305b335f43f627c4e2bf93c78360423b876
+generated: "2022-06-24T10:29:04.9225904-07:00"
diff --git a/helm/kc-cron-job/templates/cron-active-sessions.yaml b/helm/kc-cron-job/templates/cron-active-sessions.yaml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: {{ include "..fullname" . }}-active-sessions

diff --git a/helm/kc-cron-job/templates/cron-event-logs.yaml b/helm/kc-cron-job/templates/cron-event-logs.yaml
@@ -1,4 +1,4 @@
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: {{ include "..fullname" . }}-event-logs

diff --git a/helm/kc-cron-job/values-6d70e7-tools.yaml b/helm/kc-cron-job/values-6d70e7-tools.yaml
@@ -29,3 +29,15 @@ resources:
   requests:
     cpu: 0.25
     memory: 256M
+
+patroni:
+  replicaCount: 2
+
+  nameOverride: kc-cron-patroni
+  fullnameOverride: kc-cron-patroni
+
+  persistentVolume:
+    size: 50Gi
+
+  podDisruptionBudget:
+    enabled: true
diff --git a/helm/keycloak/deploy-gold-c6af30-test.sh b/helm/keycloak/deploy-gold-c6af30-test.sh
diff --git a/helm/keycloak/deploy-golddr-c6af30-test.sh b/helm/keycloak/deploy-golddr-c6af30-test.sh
diff --git a/helm/keycloak/transition-scripts/deploy-gold-active.sh b/helm/keycloak/transition-scripts/deploy-gold-active.sh
@@ -19,4 +19,3 @@ cd ./keycloak/
 helm upgrade --install sso-keycloak sso-charts/sso-keycloak \
  -n ${NAMESPACE} -f ./values-gold-${NAMESPACE}.yaml  \
  --version v1.7.1
-
diff --git a/helm/keycloak/transition-scripts/set-patroni-active.sh b/helm/keycloak/transition-scripts/set-patroni-active.sh
@@ -16,4 +16,3 @@ fi
 OUTPUT=$(kubectl -n  ${NAMESPACE} exec sso-patroni-0 -- curl -s -o /dev/null -w "%{http_code}" -XPATCH -d '{"standby_cluster":null}' http://localhost:8008/config)
 
 echo "::set-output name=patroniconfig::${OUTPUT}"
-
diff --git a/helm/keycloak/values-c6af30-dev.yaml b/helm/keycloak/values-c6af30-dev.yaml
diff --git a/helm/keycloak/values-c6af30-prod.yaml b/helm/keycloak/values-c6af30-prod.yaml
diff --git a/helm/keycloak/values-gold-c6af30-test.yaml b/helm/keycloak/values-gold-c6af30-test.yaml
diff --git a/helm/keycloak/values-golddr-c6af30-test.yaml b/helm/keycloak/values-golddr-c6af30-test.yaml
diff --git a/terraform/gold/main.tf b/terraform/gold/main.tf
@@ -16,3 +16,18 @@ output "deployer_secrets" {
   description = "Default secret names"
   value       = { for n in sort(local.namespaces) : n => module.deployers[n].default_secret_name }
 }
+
+module "admin_deployer" {
+  source  = "bcgov/openshift/deployer"
+  version = "0.10.0"
+
+  name                  = "oc-sso-deployer"
+  namespace             = "eb75ad-prod"
+  privileged_namespaces = local.namespaces
+  ops_bcgov             = true
+}
+
+output "admin_deployer_secret" {
+  description = "Admin deployer secret name"
+  value       = module.admin_deployer.default_secret_name
+}
diff --git a/terraform/golddr/main.tf b/terraform/golddr/main.tf
@@ -15,3 +15,18 @@ output "deployer_secrets" {
   description = "Default secret names"
   value       = { for n in sort(local.namespaces) : n => module.deployers[n].default_secret_name }
 }
+
+module "admin_deployer" {
+  source  = "bcgov/openshift/deployer"
+  version = "0.10.0"
+
+  name                  = "oc-sso-deployer"
+  namespace             = "eb75ad-prod"
+  privileged_namespaces = local.namespaces
+  ops_bcgov             = true
+}
+
+output "admin_deployer_secret" {
+  description = "Admin deployer secret name"
+  value       = module.admin_deployer.default_secret_name
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,4 +19,3 @@ cd ./keycloak/
		helm upgrade --install sso-keycloak sso-charts/sso-keycloak \
		-n ${NAMESPACE} -f ./values-gold-${NAMESPACE}.yaml \
		--version v1.7.1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -16,4 +16,3 @@ fi
		OUTPUT=$(kubectl -n ${NAMESPACE} exec sso-patroni-0 -- curl -s -o /dev/null -w "%{http_code}" -XPATCH -d '{"standby_cluster":null}' http://localhost:8008/config)

		echo "::set-output name=patroniconfig::${OUTPUT}"