Merge branch 'main' of ssh://git.blarre.net:2277/thomas/helm-charts

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.1

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

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: keycloak-deployment
+  name: {{ .Values.argocd.prefix }}keycloak-deployment
   namespace: {{ .Values.argocd.namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "0"
@@ -10,14 +10,26 @@ 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
       valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
         keycloakDeployment:
+          deploymentName: {{ .Values.keycloakDeployment.deploymentName }}
           numInstances: {{ .Values.keycloakDeployment.numInstances }}
           hostname: {{ .Values.keycloakDeployment.hostname }}
+          vendor: {{ .Values.keycloakDeployment.vendor }}
+          dbHost: {{ .Values.keycloakDeployment.dbHost }}
+          dbPort: {{ .Values.keycloakDeployment.dbPort }}
+          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-postinstall-app.yaml

@@ -1,7 +1,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: keycloak-postinstall
+  name: {{ .Values.argocd.prefix }}keycloak-postinstall
   namespace: {{ .Values.argocd.namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "1"
@@ -10,11 +10,12 @@ spec:
   project: {{ .Values.argocd.project }}
   source:
     repoURL: "https://git.blarre.net/thomas/helm-charts.git"
-    targetRevision: HEAD
+    targetRevision: {{ .Values.keycloakDeployment.targetRevision }}
     path: keycloak-postinstall
     helm:
       releaseName: keycloak-postinstall
       valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
         tailscaleIngresses:
           keycloakHostname: {{ .Values.tailscaleIngresses.keycloakHostname }}
   destination:

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

@@ -1,7 +1,8 @@
+{{- if .Values.dbCluster.enable -}}
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: keycloak-requirements
+  name: {{ .Values.argocd.prefix }}keycloak-requirements
   namespace: {{ .Values.argocd.namespace }}
   annotations:
     argocd.argoproj.io/sync-wave: "-1"
@@ -15,6 +16,7 @@ spec:
     helm:
       releaseName: keycloak-requirements
       valuesObject:
+        prefix: {{ .Values.argocd.prefix }}
         dbCluster:
           size: {{ .Values.dbCluster.size }}
           numInstances: {{ .Values.dbCluster.numInstances }}
@@ -29,3 +31,4 @@ spec:
       - ApplyOutOfSyncOnly=true
       - ServerSideApply=true
       - CreateNamespace=true
+{{- end }}

keycloak-argocd-apps/values.yaml

@@ -1,13 +1,26 @@
 argocd:
   namespace: argocd
   project: default
+  prefix: null
 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
+  dbPort: 5432
+  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.1

keycloak-deployment/templates/keycloak-deployment.yaml

@@ -1,19 +1,20 @@
 apiVersion: k8s.keycloak.org/v2alpha1
 kind: Keycloak
 metadata:
-  name: linode-keycloak
+  name: {{ .Values.prefix }}keycloak
 spec:
   instances: {{ .Values.keycloakDeployment.numInstances }}
   db:
-    vendor: postgres
+    vendor: {{ .Values.keycloakDeployment.vendor }}
-    host: keycloak-db-rw
+    host: {{ .Values.keycloakDeployment.dbHost }}
+    port: {{ .Values.keycloakDeployment.dbPort }}
     usernameSecret:
-      name: keycloak-db-app
+      name: {{ .Values.keycloakDeployment.usernameSecret.name }}
-      key: user
+      key: {{ .Values.keycloakDeployment.usernameSecret.key }}
     passwordSecret:
-      name: keycloak-db-app
+      name: {{ .Values.keycloakDeployment.passwordSecret.name }}
-      key: password
+      key: {{ .Values.keycloakDeployment.passwordSecret.key }}
-    database: app
+    database: {{ .Values.keycloakDeployment.database }}
   ingress:
     enabled: false
   http:

keycloak-deployment/values.yaml

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

keycloak-postinstall/templates/ts-ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: ts-keycloak
+  name: {{ .Values.prefix }}ts-keycloak
   annotations:
     tailscale.com/funnel: "true"
 spec:

keycloak-postinstall/values.yaml

@@ -1,2 +1,3 @@
+prefix: null
 tailscaleIngresses:
   keycloakHostname: sso

keycloak-requirements/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 name: keycloak-requirements
 description: A Helm chart for deploying the DB used by keycloak
 type: application
-version: 0.1.0
+version: 0.1.1

keycloak-requirements/templates/db-cluster.yaml

@@ -1,7 +1,7 @@
 apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
-  name: keycloak-db
+  name: {{ .Values.prefix }}keycloak-db
 spec:
   instances: {{ .Values.dbCluster.numInstances }}
 

keycloak-requirements/values.yaml

@@ -1,4 +1,4 @@
+prefix: null
 dbCluster:
   size: 1Gi
   numInstances: 3
-