Prepping to use the linode database for keycloak

keycloak-argocd-apps/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: keycloak-argocd-apps
 description: A Helm chart for deploying the different argocd apps to deploy Keycloak
 type: application
-version: 0.1.0
+version: 0.2.0

keycloak-argocd-apps/templates/keycloak-deployment-app.yaml

@@ -10,7 +10,7 @@ spec:
   project: {{ .Values.argocd.project }}
   source:
     repoURL: "https://git.blarre.net/thomas/helm-charts.git"
-    targetRevision: HEAD
+    targetRevision: {{ .Values.keycloakDeployment.targetRevision }}
     path: keycloak-deployment
     helm:
       releaseName: keycloak-deployment
@@ -18,6 +18,15 @@ spec:
         keycloakDeployment:
           numInstances: {{ .Values.keycloakDeployment.numInstances }}
           hostname: {{ .Values.keycloakDeployment.hostname }}
+          vendor: {{ .Values.keycloakDeployment.vendor }}
+          dbHost: {{ .Values.keycloakDeployment.dbHost }}
+          usernameSecret:
+            name: {{ .Values.keycloakDeployment.usernameSecret.name }}
+            key: {{ .Values.keycloakDeployment.usernameSecret.key }}
+          passwordSecret:
+            name: {{ .Values.keycloakDeployment.passwordSecret.name }}
+            key: {{ .Values.keycloakDeployment.passwordSecret.key }}
+          database: {{ .Values.keycloakDeployment.database }}
   destination:
     server: {{ .Values.mainDestination }}
     namespace: {{ .Values.mainNamespace }}

keycloak-argocd-apps/templates/keycloak-requirements-app.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.dbCluster.enable -}}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
@@ -29,3 +30,4 @@ spec:
       - ApplyOutOfSyncOnly=true
       - ServerSideApply=true
       - CreateNamespace=true
+{{- end }}

keycloak-argocd-apps/values.yaml

@@ -2,12 +2,23 @@ argocd:
   namespace: argocd
   project: default
 dbCluster:
+  enable: true
   size: 10Gi
   numInstances: 3
 mainNamespace: keycloak
 mainDestination: https://kubernetes.default.svc
 keycloakDeployment:
+  targetRevision: HEAD
   numInstances: 1
   hostname: sso.domain.net
+  vendor: postgres
+  dbHost: keycloak-db-rw
+  usernameSecret:
+    name: keycloak-db-app
+    key: user
+  passwordSecret:
+    name: keycloak-db-app
+    key: password
+  database: app
 tailscaleIngresses:
   keycloakHostname: sso

keycloak-deployment/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: keycloak-deployment
 description: A Helm chart for deploying the actual keycloak pod through the keycloak operator
 type: application
-version: 0.1.0
+version: 0.2.0

keycloak-deployment/templates/keycloak-deployment.yaml

@@ -5,15 +5,15 @@ metadata:
 spec:
   instances: {{ .Values.keycloakDeployment.numInstances }}
   db:
-    vendor: postgres
-    host: keycloak-db-rw
+    vendor: {{ .Values.keycloakDeployment.vendor }}
+    host: {{ .Values.keycloakDeployment.dbHost }}
     usernameSecret:
-      name: keycloak-db-app
-      key: user
+      name: {{ .Values.keycloakDeployment.usernameSecret.name }}
+      key: {{ .Values.keycloakDeployment.usernameSecret.key }}
     passwordSecret:
-      name: keycloak-db-app
-      key: password
-    database: app
+      name: {{ .Values.keycloakDeployment.passwordSecret.name }}
+      key: {{ .Values.keycloakDeployment.passwordSecret.key }}
+    database: {{ .Values.keycloakDeployment.database }}
   ingress:
     enabled: false
   http:

keycloak-deployment/values.yaml

@@ -1,3 +1,12 @@
 keycloakDeployment:
   numInstances: 1
-  hostname: sso.domain.net
+  hostname: sso.domain.net
+  vendor: postgres
+  dbHost: keycloak-db-rw
+  usernameSecret:
+    name: keycloak-db-app
+    key: user
+  passwordSecret:
+    name: keycloak-db-app
+    key: password
+  database: app