From 39894c043bb9259b5a832e94967605d7ea742b8d Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Wed, 9 Jul 2025 13:18:31 +1000 Subject: [PATCH] Rebase Memos smb volume --- services/Memos/application-memos.yaml | 13 ++++---- services/Memos/deployment-memos.yaml | 6 ++-- .../persistentvolume-csismb-memos-data.yaml | 33 +++++++++++++++++++ ...ersistentvolume-flexvolsmb-memos-data.yaml | 19 ----------- ...sistentvolumeclaim-csismb-memos-data.yaml} | 4 +-- .../sealedsecret-flexvolsmb-credentials.yaml | 16 --------- .../Memos/sealedsecret-smb-credentials.yaml | 16 +++++++++ 7 files changed, 61 insertions(+), 46 deletions(-) create mode 100644 services/Memos/persistentvolume-csismb-memos-data.yaml delete mode 100644 services/Memos/persistentvolume-flexvolsmb-memos-data.yaml rename services/Memos/{persistentvolumeclaim-flexvolsmb-memos-data.yaml => persistentvolumeclaim-csismb-memos-data.yaml} (68%) delete mode 100644 services/Memos/sealedsecret-flexvolsmb-credentials.yaml create mode 100644 services/Memos/sealedsecret-smb-credentials.yaml diff --git a/services/Memos/application-memos.yaml b/services/Memos/application-memos.yaml index a66e576..3a1f577 100644 --- a/services/Memos/application-memos.yaml +++ b/services/Memos/application-memos.yaml @@ -8,10 +8,11 @@ spec: namespace: memos server: https://kubernetes.default.svc project: default - source: - path: services/Memos - 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/Memos + targetRevision: HEAD diff --git a/services/Memos/deployment-memos.yaml b/services/Memos/deployment-memos.yaml index 4f8ac72..15094a9 100644 --- a/services/Memos/deployment-memos.yaml +++ b/services/Memos/deployment-memos.yaml @@ -27,8 +27,8 @@ spec: containerPort: 5230 volumeMounts: - mountPath: /var/opt/memos - name: flexvolsmb-memos-data + name: csismb-memos-data volumes: - - name: flexvolsmb-memos-data + - name: csismb-memos-data persistentVolumeClaim: - claimName: flexvolsmb-memos-data + claimName: csismb-memos-data diff --git a/services/Memos/persistentvolume-csismb-memos-data.yaml b/services/Memos/persistentvolume-csismb-memos-data.yaml new file mode 100644 index 0000000..e6de8fe --- /dev/null +++ b/services/Memos/persistentvolume-csismb-memos-data.yaml @@ -0,0 +1,33 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + annotations: + pv.kubernetes.io/provisioned-by: smb.csi.k8s.io + name: csismb-memos-data +spec: + capacity: + storage: 1Gi + accessModes: + - ReadWriteMany + persistentVolumeReclaimPolicy: Retain + storageClassName: csismb-memos-data + mountOptions: + - dir_mode=0777 + - file_mode=0777 + - uid=1001 + - gid=1001 + - 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#memos#data + volumeAttributes: + source: //192.168.154.195/K3s.Volumes + subDir: memos/data + nodeStageSecretRef: + name: smb-credentials + namespace: memos diff --git a/services/Memos/persistentvolume-flexvolsmb-memos-data.yaml b/services/Memos/persistentvolume-flexvolsmb-memos-data.yaml deleted file mode 100644 index a6ee3d7..0000000 --- a/services/Memos/persistentvolume-flexvolsmb-memos-data.yaml +++ /dev/null @@ -1,19 +0,0 @@ -apiVersion: v1 -kind: PersistentVolume -metadata: - name: flexvolsmb-memos-data - namespace: memos -spec: - capacity: - storage: 1Gi - accessModes: - - ReadWriteMany - storageClassName: flexvolsmb-memos-data - flexVolume: - driver: mount/smb - secretRef: - name: flexvolsmb-credentials - options: - opts: file_mode=0600,dir_mode=0700,uid=1001,gid=1001,iocharset=utf8,nobrl - server: 192.168.154.195 - share: /K3s.Volumes/memos/data diff --git a/services/Memos/persistentvolumeclaim-flexvolsmb-memos-data.yaml b/services/Memos/persistentvolumeclaim-csismb-memos-data.yaml similarity index 68% rename from services/Memos/persistentvolumeclaim-flexvolsmb-memos-data.yaml rename to services/Memos/persistentvolumeclaim-csismb-memos-data.yaml index f5986be..0a80bbd 100644 --- a/services/Memos/persistentvolumeclaim-flexvolsmb-memos-data.yaml +++ b/services/Memos/persistentvolumeclaim-csismb-memos-data.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: flexvolsmb-memos-data + name: csismb-memos-data namespace: memos spec: accessModes: - ReadWriteMany - storageClassName: flexvolsmb-memos-data + storageClassName: csismb-memos-data resources: requests: storage: 1Gi diff --git a/services/Memos/sealedsecret-flexvolsmb-credentials.yaml b/services/Memos/sealedsecret-flexvolsmb-credentials.yaml deleted file mode 100644 index b5160cb..0000000 --- a/services/Memos/sealedsecret-flexvolsmb-credentials.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - creationTimestamp: null - name: flexvolsmb-credentials - namespace: memos -spec: - encryptedData: - password: AgBeEaCDaKwgafALNYq/ykvhoYtC9N+1D+DN37HrwpGEEbw8cXKBdmO7cV3hRL/uT9FvvCh3g0fq7a0xozjZiFDxzUM5V+pY37ENvoDBepbdAktwCXFhXmarSHVuLH0q8j8eS3OFYUR2Xdh6eivhpeYEqs0kC8G9VaplHWFGLJQBDKDKg3pfhlPu9E9FX7uspYHKazMfS6L0x9bxJl/hktl33Mh+kEprMcppYocdI3SNoR3OGvbwiZIpLG/ihavviybmzsRofUT8/s27ACX6URym7KCy/+Sq0hx4e5qCN30rYl2HkdKZmY91YPunnT+UmHuH30Vj52uFNV/ySd3P+G9hRE2BVNFvaZ5Mu4BA5Ei+F2l8xJar9NJ0mi2VYbIjWarQmvcaywfHR1TsQ5lmhSxHuJhx4tllTKcDHBl1wTWkRRWIjWWvRdjcCwNpAKGiKvbExxI715JgmFn/4wOvlX7UkRBUr3QAhVzNHVbd8mexlotqTIaPVXEjJ79Oc61yAU5Q1ZFLzpeDbI/Rz1egjBXsAW0V4ojA6TDKiyBEs9g3WoTjI3Ziwn31Rmg1r0/Vc2uJERcMU0i+Chh49duyurL3K6AKBfm7NHh6bwABUnYtb2BQj+CBK8Bkm3XWfLo8ul4hZarYwg2nE/tY2ZVIS1Jc7XpiZAhpBqF4Drz46lKY5Pi45atMmZt6rGAdx3LbZdk87DMqMnEdzX+PXLWSBQQJ - username: AgAJdgjk+DU8EhLKSHE/H3i4D/lwrzzmi5SqCc5XT6aMFnZ7hAtdubd6qH2QfpvS0EpjHn0C4WeT6JdUAvB4w5Ee3MPRmxrUlt4zfOjXtv7mrnrOaEunlczKxOJDZp+J8NsBb3fgzCfoZilAi9uewffDJ6YXxSwNTgBpx1JGB7c7QDxvYh3L0whqQN87hrw9ZObFVSTUztTQQH7QgDIBRUTH+1YkMHftkzKLdvwRdcKrQ3NYIqbcQFsFlelTVWQYfQ8WteR7k1H4QABe3oeCnm7OD3dwQbbuksd+sA5i4lsYHIPVQW46hcxhRk46ONTyB5HeSfSITE//p2XU3PLYoKWjvUC71vJkFtT4eFE50hoSdGZW7CsNJnnFGMXobhhtvPWJ4TdzM8bRNGHpmxxigTIKM/GNuhckuUNcHlFTYdqEglJpBAWpaDcgIiqaDV9S/AajSk8jwBNG7OQYNmJUiLe1ZyZR2JSVyFszCzJe9/I8k1RK5HEbBYpRd46oZS+qgD4/4t3P/9fF7I7IlMNjBdBDb4HGs9lMdnNQyXYaelMmPWrbw8FOSfV1QggKkcE4j2D2j60AmljLxVadnr0r1oB+NPsCDmo24BYhjMgSZY79vDcRK+sy9475A+UE7ACJYKdYHkh0tyriSn/Dnp/XXfr7dIi78dAd4q6DfTuLOgfKTe6MORktxgTvWKe+dcOXZGGKik9DLk8= - template: - metadata: - creationTimestamp: null - name: flexvolsmb-credentials - namespace: memos - type: mount/smb diff --git a/services/Memos/sealedsecret-smb-credentials.yaml b/services/Memos/sealedsecret-smb-credentials.yaml new file mode 100644 index 0000000..fffc28c --- /dev/null +++ b/services/Memos/sealedsecret-smb-credentials.yaml @@ -0,0 +1,16 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: smb-credentials + namespace: memos +spec: + encryptedData: + password: AgBp0xmRNTIUJ8c50lsNFa4SsT3HjJ5tMTR5QdCZBVlGDiYl7ZlL7nX7VMyR2aZf5awEh4fnSd145kj2NxIhrPVi0rdviH4BsmybNLf6WJzEKG6wQnJvD8d74RHsKV9NDkuOixld8qBwMBEo3WkfOPn2VYMYZrBM7H+7DGBiXcXOUG5vZ8W+au5FePluWGNsaJYEvOiyESla/jLYraKYFDq2mIl8kZdvVY9U5vc+ITa7ktgp0irtjm8wzv8M2/AY/FKk7PNZjE2vYQXYzhTSPZDzizDLRvvun/83yCvVLrHCLG7mcTyHB+6bDITSF5XSymxkAbU9MN455PLDzBcZJyH1QRO3Yi6dFY1vXA9q1vaboanxkInFaMQW/IZsR+GExVAGc+MZ9Q8kIT6tKVu6vw3PSCVUOlkbIJGdH8WPsdASTYpdusnt2NW9idjqc1bLXdCBqh3aMzwKTiD6wpA1kAWdCVpxkDdMZFg/E9sQJTqjD5XCRh0SvHOlrd2ZteHqyYLPYx1tkCDpN33b0K24XatftReKHlYnXum+RympNLYWs6cUyeegAAfauvrI4wqEhkB1oXvri1wRqAVKxo21hqf9Z0vPd0azkJ5+BA34QG0nfUskgNkvyJwNL7iwKgFasU+YziVHh21ZP8RxNRwzmNNcvcR/WiLrz7rfA05Pok/+q/7YLr5+QsxFbgemwXKbOUvARjHxi6tpqEoDp4r4jHG8 + username: AgB3UU+q37U0s3SPnnb1YtIgxPIPGaogzc7L199wtqUHY1QJ0Z+yHegbtE0TU+c+RhpjGO41ntVnQiW5+V777G2Zs43ehJQmChSf6AXRtLTVeSRTzztlB3tACZfzglrU07LaGWkigAszLtTwJLkt9yFADewGlPEzY9EGSe3xFReA4TRIpqlNLlDwPBx/eI5TqehXtYkPQN4/+xsA2iWjJrVj8MxPvvQaj9Alhxfs51QYXmg/i2sC15+CG5ndSWhouvmzdqAYyb/L2JvqTcJludrMT4r3UhEAbfG1YLvPoigpkF1pVY3+hz1c1kb6YgmxBwGe/w/Ys6wjJIa1aESkf0xTTpfr6bys96T0VvI1GlC3WhU0jJJ42VjuSqfdwqFrLwCyoZNMB5MLmQLe5XrBz3bQ7DOA2MBdTSU0Pbd21hMxTnNtGsOa0rycm4u0o3mV3mwYQCzhIiMHZHfIQe1ULNwA3/c6yTRtWIClYFgVcPEgfwKBdVBM+hWEHCuol2XjHPXHdWeqCYr5fjjF8ain3LcDYJoiwXXtC6+G8s1u+LGX6pXlWNpWrUQMK8Ps1lC+5QxaJZFafHCTxcYbFRaQ5Zp92wfkfbfkqXc9W0KzkxeCIdkWRZgCcSac32oobcarjIlgF6tvnQ67NsGT9xV9vZkBs+eI7uCT/ohtwm7gNdmq5t0RPE0ScgWxqf+NgiCqlc5gpOTmsic= + template: + metadata: + creationTimestamp: null + name: smb-credentials + namespace: memos + type: Opaque