From fd55bd98d0b61fff83a2ecb7dd99fe022e337791 Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Wed, 9 Jul 2025 12:38:20 +1000 Subject: [PATCH] Rebase Authelia smb volumes --- services/Authelia/application-authelia.yaml | 15 +++++---- services/Authelia/deployment-authelia.yaml | 10 +++--- ...persistentvolume-csismb-authelia-conf.yaml | 31 +++++++++++++++++ ...ersistentvolume-csismb-authelia-redis.yaml | 33 +++++++++++++++++++ ...istentvolume-flexvolsmb-authelia-conf.yaml | 18 ---------- ...stentvolume-flexvolsmb-authelia-redis.yaml | 18 ---------- ...tentvolumeclaim-csismb-authelia-conf.yaml} | 4 +-- ...entvolumeclaim-csismb-authelia-redis.yaml} | 4 +-- .../sealedsecret-flexvolsmb-credentials.yaml | 16 --------- .../sealedsecret-smb-credentials.yaml | 16 +++++++++ 10 files changed, 97 insertions(+), 68 deletions(-) create mode 100644 services/Authelia/persistentvolume-csismb-authelia-conf.yaml create mode 100644 services/Authelia/persistentvolume-csismb-authelia-redis.yaml delete mode 100644 services/Authelia/persistentvolume-flexvolsmb-authelia-conf.yaml delete mode 100644 services/Authelia/persistentvolume-flexvolsmb-authelia-redis.yaml rename services/Authelia/{persistentvolumeclaim-flexvolsmb-authelia-conf.yaml => persistentvolumeclaim-csismb-authelia-conf.yaml} (67%) rename services/Authelia/{persistentvolumeclaim-flexvolsmb-authelia-redis.yaml => persistentvolumeclaim-csismb-authelia-redis.yaml} (66%) delete mode 100644 services/Authelia/sealedsecret-flexvolsmb-credentials.yaml create mode 100644 services/Authelia/sealedsecret-smb-credentials.yaml diff --git a/services/Authelia/application-authelia.yaml b/services/Authelia/application-authelia.yaml index 2c52121..93236ec 100644 --- a/services/Authelia/application-authelia.yaml +++ b/services/Authelia/application-authelia.yaml @@ -5,13 +5,14 @@ metadata: namespace: argo-cd spec: destination: - namespace: authelia server: https://kubernetes.default.svc + namespace: authelia project: default - source: - path: services/Authelia - repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog.git - targetRevision: HEAD syncPolicy: - automated: - selfHeal: true + automated: {} + syncOptions: + - CreateNamespace=true + sources: + - repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog + path: services/Authelia + targetRevision: HEAD diff --git a/services/Authelia/deployment-authelia.yaml b/services/Authelia/deployment-authelia.yaml index c283ea8..8618b7e 100644 --- a/services/Authelia/deployment-authelia.yaml +++ b/services/Authelia/deployment-authelia.yaml @@ -43,12 +43,12 @@ spec: - name: redis containerPort: 6379 volumeMounts: - - name: flexvolsmb-authelia-redis + - name: csismb-authelia-redis mountPath: /data volumes: - - name: flexvolsmb-authelia-conf + - name: csismb-authelia-conf persistentVolumeClaim: - claimName: flexvolsmb-authelia-conf - - name: flexvolsmb-authelia-redis + claimName: csismb-authelia-conf + - name: csismb-authelia-redis persistentVolumeClaim: - claimName: flexvolsmb-authelia-redis + claimName: csismb-authelia-redis diff --git a/services/Authelia/persistentvolume-csismb-authelia-conf.yaml b/services/Authelia/persistentvolume-csismb-authelia-conf.yaml new file mode 100644 index 0000000..8372d1a --- /dev/null +++ b/services/Authelia/persistentvolume-csismb-authelia-conf.yaml @@ -0,0 +1,31 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + annotations: + pv.kubernetes.io/provisioned-by: smb.csi.k8s.io + name: csismb-authelia-conf +spec: + capacity: + storage: 1Gi + accessModes: + - ReadWriteMany + persistentVolumeReclaimPolicy: Retain + storageClassName: csismb-authelia-conf + mountOptions: + - dir_mode=0600 + - file_mode=0600 + - nobrl + - cache=none + - mfsymlinks + - noserverino # required to prevent data corruption + csi: + driver: smb.csi.k8s.io + # volumeHandle format: {smb-server-address}#{sub-dir-name}#{share-name} + # make sure this value is unique for every share in the cluster + volumeHandle: 192.168.154.195#authelia#conf + volumeAttributes: + source: //192.168.154.195/K3s.Volumes + subDir: authelia/conf + nodeStageSecretRef: + name: smb-credentials + namespace: authelia diff --git a/services/Authelia/persistentvolume-csismb-authelia-redis.yaml b/services/Authelia/persistentvolume-csismb-authelia-redis.yaml new file mode 100644 index 0000000..960738f --- /dev/null +++ b/services/Authelia/persistentvolume-csismb-authelia-redis.yaml @@ -0,0 +1,33 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + annotations: + pv.kubernetes.io/provisioned-by: smb.csi.k8s.io + name: csismb-authelia-redis +spec: + capacity: + storage: 1Gi + accessModes: + - ReadWriteMany + persistentVolumeReclaimPolicy: Retain + storageClassName: csismb-authelia-redis + mountOptions: + - dir_mode=0700 + - file_mode=0700 + - uid=999 + - gid=1000 + - nobrl + - cache=none + - mfsymlinks + - noserverino # required to prevent data corruption + csi: + driver: smb.csi.k8s.io + # volumeHandle format: {smb-server-address}#{sub-dir-name}#{share-name} + # make sure this value is unique for every share in the cluster + volumeHandle: 192.168.154.195#authelia#redis + volumeAttributes: + source: //192.168.154.195/K3s.Volumes + subDir: authelia/redis + nodeStageSecretRef: + name: smb-credentials + namespace: authelia diff --git a/services/Authelia/persistentvolume-flexvolsmb-authelia-conf.yaml b/services/Authelia/persistentvolume-flexvolsmb-authelia-conf.yaml deleted file mode 100644 index 2ffbf2c..0000000 --- a/services/Authelia/persistentvolume-flexvolsmb-authelia-conf.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: flexvolsmb-authelia-conf -spec: - capacity: - storage: 1Gi - accessModes: - - ReadWriteMany - storageClassName: flexvolsmb-authelia-conf - flexVolume: - driver: mount/smb - secretRef: - name: flexvolsmb-credentials - options: - opts: file_mode=0600,dir_mode=0600,iocharset=utf8,nobrl - server: 192.168.154.195 - share: /K3s.Volumes/authelia/conf diff --git a/services/Authelia/persistentvolume-flexvolsmb-authelia-redis.yaml b/services/Authelia/persistentvolume-flexvolsmb-authelia-redis.yaml deleted file mode 100644 index 0a7543b..0000000 --- a/services/Authelia/persistentvolume-flexvolsmb-authelia-redis.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: flexvolsmb-authelia-redis -spec: - capacity: - storage: 1Gi - accessModes: - - ReadWriteMany - storageClassName: flexvolsmb-authelia-redis - flexVolume: - driver: mount/smb - secretRef: - name: flexvolsmb-credentials - options: - opts: file_mode=0700,dir_mode=0700,uid=999,gid=1000,iocharset=utf8,nobrl - server: 192.168.154.195 - share: /K3s.Volumes/authelia/redis diff --git a/services/Authelia/persistentvolumeclaim-flexvolsmb-authelia-conf.yaml b/services/Authelia/persistentvolumeclaim-csismb-authelia-conf.yaml similarity index 67% rename from services/Authelia/persistentvolumeclaim-flexvolsmb-authelia-conf.yaml rename to services/Authelia/persistentvolumeclaim-csismb-authelia-conf.yaml index 261d435..adeafe6 100644 --- a/services/Authelia/persistentvolumeclaim-flexvolsmb-authelia-conf.yaml +++ b/services/Authelia/persistentvolumeclaim-csismb-authelia-conf.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: flexvolsmb-authelia-conf + name: csismb-authelia-conf namespace: authelia spec: accessModes: - ReadWriteMany - storageClassName: flexvolsmb-authelia-conf + storageClassName: csismb-authelia-conf resources: requests: storage: 1Gi diff --git a/services/Authelia/persistentvolumeclaim-flexvolsmb-authelia-redis.yaml b/services/Authelia/persistentvolumeclaim-csismb-authelia-redis.yaml similarity index 66% rename from services/Authelia/persistentvolumeclaim-flexvolsmb-authelia-redis.yaml rename to services/Authelia/persistentvolumeclaim-csismb-authelia-redis.yaml index a73d0e8..2c3e193 100644 --- a/services/Authelia/persistentvolumeclaim-flexvolsmb-authelia-redis.yaml +++ b/services/Authelia/persistentvolumeclaim-csismb-authelia-redis.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: flexvolsmb-authelia-redis + name: csismb-authelia-redis namespace: authelia spec: accessModes: - ReadWriteMany - storageClassName: flexvolsmb-authelia-redis + storageClassName: csismb-authelia-redis resources: requests: storage: 1Gi diff --git a/services/Authelia/sealedsecret-flexvolsmb-credentials.yaml b/services/Authelia/sealedsecret-flexvolsmb-credentials.yaml deleted file mode 100644 index 8418365..0000000 --- a/services/Authelia/sealedsecret-flexvolsmb-credentials.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - creationTimestamp: null - name: flexvolsmb-credentials - namespace: authelia -spec: - encryptedData: - password: AgC/GDJHhqeyFSWsJ8Ie3tt9ppAe3Ns6tt29rieMKcJrQ71sn47MFEow9SOJJVNSjzUWukDg8tRrkq3CdB63jz7NO6CWKNy++nlSU0adDtuwioNUov3a9bnhzgdjjM/ZzpO/pz7j/utGFO1bkPWn4bU/tGoRYM1TsjP1t9m2qL/Me9LigLtafG8LTd/JKNHdyvii1CNcWkZoxKTocy+YdB3hA+0KZClxaQ2O5KPZMl6AoxJGWcuOVpvqQ831Epkl4f+uJp+YtMZbu+poB+hxhuhFZZH9Sx1sn20mZd8M2Kc863oJjzpZPAR5I9faMmDyEqBvJmdS9C9dZrpIdeDZFm25QYIGgu3ZNk+LItuWSoW8kZGsEefsINV6rqAOQmysfvq5aPkYe90RHvaf6Nf0F4wYq1fEiEoSnLPH+J0ToUSIPxMftBcXimTm/HtkUJCg2+rDb+EHp9ahjGaJBp45vd8hOKSF50GA2X8e4UlvbR6QBib6G//F7Pf6OBgsVxSvKQmlSsrBJRo3hxm7G7iLWd5lCmk0jbgRFWJvEnQMk/FqYoc/fcodpGtzEM0I6jL4Kpi1DnRnIgHQTWtU3LVF9aym2H1ExhZfhu0I2F56VQsQcg3vUVOBOwF+XjlrBaAEAEMcbBuigUbvqiSfpUHMQJSsIjtnkAEUs0/19iNCNNSvmjENr5Ml+88iqYQmg9hY11s4LbrsXa5t8q2TgTBrfPVw - username: AgCORI9b0L6FSdB+yDY6VEq77p9CFcwnpZ7nb0M1bz7tVNluYQSB69Y6dLTDCCVx2KdOXyU/QOdb0z8mzEywtC9R4Kzm4+SkTRHgrKOTmxXF3qW5VZDe0UlbSbJUUb3YdC9k2HPPoUvg45woGv1LGXFHgYTxbG+U1lxU8LDoMKfBQ3+GaeUUjI2bx33kyHKztyQizd+b2eSkoSHwRCHiBWZMNYa3zEvY6+07ytKJtaOhGhVsdt04blw4jUMym2sHOBCf95pAzI9gJH2RcuQBQI+ZXci0VeMPvmY3B6T+MruH+1Goy+/HoZOjI2Keu1Jk/Ppg/1FyB9VGX6A2YMyismk8LKWKG0/RNBfWn8RcDVlpgAcjDeX2PdYY17E/gZz2NLnIctBJ/dc93QjrAp/ZfLXBakCA3d0LKLFjUbpKwgaST5wnKif+UjqasDyjVkEG7jK5lGk3fmRCDyPgyxzqkUOSeCHQjDUa07AqKm56qfz/Wr9gm94VC1GiQ39F5/LAnAa2+qAQyJ+RVCBkXmt33sDSvelmXKmh9rIBCvsIxwUSkprpf76HcReRjaRv/9CyuPaskjYAkwOX6/NQPDQVHgKYtvoUhm4OnJ4amrsK2tPco1HC9xPGFIhrqoWeyfiUc1ui8IjxO5geV4hAWSUi5J/H3XBXsFpQt6ZqbemTnQyorTGd0asNP/6OTBtMcIgaPMmZi7F1Olo= - template: - metadata: - creationTimestamp: null - name: flexvolsmb-credentials - namespace: authelia - type: mount/smb diff --git a/services/Authelia/sealedsecret-smb-credentials.yaml b/services/Authelia/sealedsecret-smb-credentials.yaml new file mode 100644 index 0000000..46ac91d --- /dev/null +++ b/services/Authelia/sealedsecret-smb-credentials.yaml @@ -0,0 +1,16 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: smb-credentials + namespace: authelia +spec: + encryptedData: + password: AgBFKV//U1Pd9HlRAIk1Mv4iQBs5A3Z2ixe5RqglCAmpeG5AgS1h4pIuZSN6tEPAj7lKkkFt0LkSQIlSIBiU+Rqw2ziRwQuntIOy2IRmGMRyHA6f7AdFM21HHI0eS7ND0yamlYV0RPidyn7TzYhAmAoECsFzU64COBYZcZygVquOklw5zTH6MlXzTC6L7l4FtbQa1mvuIgGT5p0jXarSAAODOPm7O1c+g1aRvqWDSz1LI5wq4c5kSXdNlgH6+ZNLiYNKUx5HfqujCsd5wHW/hou0JpliiLFsADW0YXssLgb1zkCG++FdO+Pt/kDVStj4yFcSg7h2Ym0U3kmKx0H0mH7Qz91N5hV61Cc3Yh1ngyVS1bmW4xvlEy+yefYwvqWjWcoQHtBWqXJvNOcBkigo6+fd16YhHwRVp4REipjd7E5EXqVdKFkwFznLK4lm9LmCFT++WT5v4zJNia/AkXsAZwld7T6oR0uZ5aaXjnGh6ah5QRstAs3fDaJBObPPUOdBgxQ5mutp3AZkrWJnX534YRLtWkTrVftCo8hxbsVqA+h5deGKuBPPCGtkBbdk3ytrMmZ3sSw4ZZO76Y9aEK8eG/N+i7NOi1DM5KwMknURR2c5WMlbAABkUswLlB/ChnUcWhsJ2ooS64kcGGAAoqr81fxy7EKK9KzBEqzQq7dXZg0U8786xD4yQQyy2FercGY5g2HAsqripRbvCCNkMihTjA7d + username: AgACSLitw/XzwlDjsVTrwSEUigBO9NGtYTxK6oSpkuervaZW3K5t1O9CUNm3BfOUTaz/yZDnu+LtgXbVMIKp/SM6ivmCzxPO/4Ph+UD5m3mogGl0fV1agfN80VOsxbpZHwXmTGwws9jY4jFjFHRroNgfYtpwp0f7NYiuYCg0c0+9xrm3WURKcMoUwfm01Ut7aSld24xLgePYtiS0YzbhYg0bDo6sSGUWOgyxJxRiMaqCu5JNyQl5byJGUuOgJB1J/ccsZwu47WdercWiEcSQgd1SZpBJzvzIaTpyaafAd/L/uX7cXJW3RBAyzwO4mq5hdiYXzRG12FKJB+HSaYOEJatM5WFZTNLtLR+S+6vrOIA8KnPeOF7HQUupVolYGH/Aq/Kc0o33iHi58GyFIJUnY70HwJpTgF1e35Hbhip83vjQEXcB1Ly7sSbGT7UbMUYjyVSHRXoNg5QY4YXIkWm3qTiWr+ws1JYX3jpkRswYsk5mIvTneF2grGgdcNJG4XBKJVVn8BLTsW0wC/BAA1thIn0cLgCN3tgT9bgu/r518TMxa8hOdLsNuCJqVr6CLEWuoFqB9QswS/4gYwUZgLlbD2FW1mynLq7USi+hDt8sPjrZKQYmGhLDdlTNEF6YBOX4xDmXYvc26cE33QYyAU3+8lpRTIHX1l0OfjQ6tHprvgZbMi4hkDtdZgW4PgvE8wLdr2NpBO8CEv4= + template: + metadata: + creationTimestamp: null + name: smb-credentials + namespace: authelia + type: Opaque