Merge pull request 'keycloak-v2' (#3) from keycloak-v2 into main

Reviewed-on: #3

immich-argocd-apps/Chart.yaml

@@ -2,4 +2,5 @@ apiVersion: v2
 name: immich-argocd-apps
 description: A Helm chart for deploying Immich as an ArgoCD app
 type: application
-version: 0.1.0
+version: 0.3.0
+appVersion: v1.123.0

immich-argocd-apps/templates/immich-main-chart.yaml

@@ -17,6 +17,8 @@ spec:
     helm:
       releaseName: immich
       valuesObject:
+        image:
+          tag: {{ .Chart.AppVersion }}
         immich:
           persistence:
             library:

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:
-  size: 1Gi
+  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
-    host: keycloak-db-rw
+    vendor: {{ .Values.keycloakDeployment.vendor }}
+    host: {{ .Values.keycloakDeployment.dbHost }}
+    port: {{ .Values.keycloakDeployment.dbPort }}
     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,14 @@
+prefix: null
 keycloakDeployment:
   numInstances: 1
-  hostname: sso.domain.net
+  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
-
+  numInstances: 3

vaultwarden-argocd-apps/templates/vaultwarden-chart.yaml

@@ -15,15 +15,29 @@ spec:
     helm:
       releaseName: vaultwarden
       valuesObject:
+        domain: {{ .Values.vaultwarden.domain }}
+        timeZone: {{ .Values.vaultwarden.timeZone }}
+        adminToken:
+          value: {{ .Values.vaultwarden.adminToken.value }}
         database:
           type: postgresql
           existingSecret: {{ .Values.vaultwarden.dbCluster.secretName }}
           existingSecretKey: uri
+        data:
+          name: {{ .Values.vaultwarden.dataPvc.name }}
+          size: {{ .Values.vaultwarden.dataPvc.size }}
+          class: {{ .Values.vaultwarden.dataPvc.storageClassName }}
+          accessMode: {{ .Values.vaultwarden.dataPvc.accessMode }}
+        attachments:
+          name: {{ .Values.vaultwarden.attachmentPvc.name }}
+          size: {{ .Values.vaultwarden.attachmentPvc.size }}
+          class: {{ .Values.vaultwarden.attachmentPvc.storageClassName }}
+          accessMode: {{ .Values.vaultwarden.attachmentPvc.accessMode }}
         ingress:
-          enabled: true
+          enabled: false
   destination:
-    server: {{ .Values.mainDestination }}
-    namespace: {{ .Values.mainNamespace }}
+    server: {{ .Values.destination.server }}
+    namespace: {{ .Values.destination.namespace }}
   syncPolicy:
     automated:
       prune: true           # Automatically remove resources no longer in the repo

vaultwarden-argocd-apps/templates/vaultwarden-postinstall.yaml

@@ -0,0 +1,30 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: vaultwarden-postinstall
+  namespace: {{ .Values.argocd.namespace }}
+  annotations:
+    argocd.argoproj.io/sync-wave: "1"
+    notifications.argoproj.io/subscribe.on-sync-succeeded.telegram: "-1002270587578"
+spec:
+  project: {{ .Values.argocd.project }}
+  source:
+    repoURL: {{ .Values.argocd.postinstall.repoURL }}
+    targetRevision: {{ .Values.argocd.postinstall.targetRevision }}
+    path: {{ .Values.argocd.postinstall.path }}
+    helm:
+      releaseName: vaultwarden-postinstall
+      valuesObject:
+        tailscaleIngresses:
+          vaultwardenHostname: {{ .Values.tailscaleIngresses.vaultwardenHostname }}
+  destination:
+    server: {{ .Values.destination.server }} 
+    namespace: {{ .Values.destination.namespace }}
+  syncPolicy:
+    automated:
+      prune: true           # Automatically remove resources no longer in the repo
+      selfHeal: true        # Automatically self-heal when drift is detected
+    syncOptions:
+      - ApplyOutOfSyncOnly=true
+      - ServerSideApply=true
+      - CreateNamespace=true

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

@@ -22,7 +22,8 @@ spec:
           dataPvc:
             name: {{ .Values.vaultwarden.dataPvc.name }}
             storageClassName: {{ .Values.vaultwarden.dataPvc.storageClassName }}
-            size: {{ .Values.vaultwarden.dataPvc.size }}        
+            size: {{ .Values.vaultwarden.dataPvc.size }}
+        mainNamespace: {{ .Values.destination.namespace }}
   destination:
     server: {{ .Values.destination.server }} 
     namespace: {{ .Values.destination.namespace }}

vaultwarden-argocd-apps/values.yaml

@@ -23,8 +23,16 @@ vaultwarden:
     name: vaultwarden-data
     storageClassName: ''
     size: 10Gi
-  FQDN: vaultwarden.domain.net
-  replicaCount: 1
+    accessMode: "ReadWriteOnce"
+  attachmentPvc:
+    name: vaultwarden-attachments
+    storageClassName: 'linode-block-storage-retain-luks-vw'
+    size: 10Gi
+    accessMode: "ReadWriteOnce"
+  domain: "https://vaultwarden.domain.net"
+  timeZone: "Europe/Lisbon"
+  adminToken:
+    value:
 
 tailscaleIngresses:
-  odooHostname: odoo
+  vaultwardenHostname: vaultwarden

vaultwarden-postinstall/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
 name: vaultwarden-postinstall
-description: A Helm chart for Kubernetes
+description: A Helm chart for deploynig vaultwarden's ingress
 type: application
 version: 0.1.0

vaultwarden-postinstall/templates/vaultwarden-ingress.yaml

@@ -0,0 +1,16 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: ts-vaultwarden
+  annotations:
+    tailscale.com/funnel: "true"
+spec:
+  defaultBackend:
+    service:
+      name: vaultwarden
+      port:
+        name: http
+  ingressClassName: tailscale
+  tls:
+    - hosts:
+        - {{ .Values.tailscaleIngresses.vaultwardenHostname }}

vaultwarden-postinstall/values.yaml

@@ -0,0 +1,2 @@
+tailscaleIngresses:
+  vaultwardenHostname: vaultwarden

vaultwarden-requirements/templates/encrypted-storage-class.yaml

@@ -0,0 +1,14 @@
+allowVolumeExpansion: true
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: linode-block-storage-retain-luks-vw
+  namespace: kube-system
+provisioner: linodebs.csi.linode.com
+reclaimPolicy: Retain
+parameters:
+  linodebs.csi.linode.com/luks-encrypted: "true"
+  linodebs.csi.linode.com/luks-cipher: "aes-xts-plain64"
+  linodebs.csi.linode.com/luks-key-size: "512"
+  csi.storage.k8s.io/node-stage-secret-namespace: {{ .Values.mainNamespace }}
+  csi.storage.k8s.io/node-stage-secret-name: vw-data-luks-key

vaultwarden-requirements/templates/vaultwarden-data.yaml

@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: {{ .Values.vaultwarden.dataPvc.name }}
-spec:
-  storageClassName: {{ .Values.vaultwarden.dataPvc.storageClassName }}
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: {{ .Values.vaultwarden.dataPvc.size }}

vaultwarden-requirements/values.yaml

@@ -6,3 +6,4 @@ vaultwarden:
     name: vaultwarden-data
     storageClassName: ''
     size: 10Gi
+mainNamespace: vaultwarden