From 77cf4c9729790afb1f7f014a6d1ae603545837ff Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Wed, 9 Jul 2025 12:49:16 +1000 Subject: [PATCH] Rebase Argus smb volumes --- services/Argus/application-argus.yaml | 13 ++++---- services/Argus/deployment-argus.yml | 12 +++---- .../Argus/persistentvolume-argus-config.yml | 19 ------------ .../Argus/persistentvolume-argus-data.yml | 19 ------------ .../persistentvolume-csismb-argus-config.yaml | 31 +++++++++++++++++++ .../persistentvolume-csismb-argus-data.yaml | 31 +++++++++++++++++++ ...stentvolumeclaim-csismb-argus-config.yaml} | 5 ++- ...sistentvolumeclaim-csismb-argus-data.yaml} | 5 ++- .../sealedsecret-flexvolsmb-credentials.yaml | 16 ---------- .../Argus/sealedsecret-smb-credentials.yaml | 16 ++++++++++ 10 files changed, 95 insertions(+), 72 deletions(-) delete mode 100644 services/Argus/persistentvolume-argus-config.yml delete mode 100644 services/Argus/persistentvolume-argus-data.yml create mode 100644 services/Argus/persistentvolume-csismb-argus-config.yaml create mode 100644 services/Argus/persistentvolume-csismb-argus-data.yaml rename services/Argus/{persistentvolumeclaim-argus-data.yml => persistentvolumeclaim-csismb-argus-config.yaml} (67%) rename services/Argus/{persistentvolumeclaim-argus-config.yml => persistentvolumeclaim-csismb-argus-data.yaml} (66%) delete mode 100644 services/Argus/sealedsecret-flexvolsmb-credentials.yaml create mode 100644 services/Argus/sealedsecret-smb-credentials.yaml diff --git a/services/Argus/application-argus.yaml b/services/Argus/application-argus.yaml index b8568c5..5253801 100644 --- a/services/Argus/application-argus.yaml +++ b/services/Argus/application-argus.yaml @@ -8,10 +8,11 @@ spec: namespace: argus server: https://kubernetes.default.svc project: default - source: - path: services/Argus - 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/Argus + targetRevision: HEAD diff --git a/services/Argus/deployment-argus.yml b/services/Argus/deployment-argus.yml index 346de4a..f0c051d 100644 --- a/services/Argus/deployment-argus.yml +++ b/services/Argus/deployment-argus.yml @@ -25,14 +25,14 @@ spec: - name: web containerPort: 8080 volumeMounts: - - name: flexvolsmb-argus-config + - name: csismb-argus-config mountPath: /app/config - - name: flexvolsmb-argus-data + - name: csismb-argus-data mountPath: /app/data volumes: - - name: flexvolsmb-argus-config + - name: csismb-argus-config persistentVolumeClaim: - claimName: flexvolsmb-argus-config - - name: flexvolsmb-argus-data + claimName: csismb-argus-config + - name: csismb-argus-data persistentVolumeClaim: - claimName: flexvolsmb-argus-data + claimName: csismb-argus-data diff --git a/services/Argus/persistentvolume-argus-config.yml b/services/Argus/persistentvolume-argus-config.yml deleted file mode 100644 index db5da75..0000000 --- a/services/Argus/persistentvolume-argus-config.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolume -metadata: - name: flexvolsmb-argus-config -spec: - capacity: - storage: 1Gi - accessModes: - - ReadWriteMany - storageClassName: flexvolsmb-argus-config - flexVolume: - driver: mount/smb - secretRef: - name: flexvolsmb-credentials - options: - opts: file_mode=0777,dir_mode=0777,iocharset=utf8 - server: 192.168.154.195 - share: /K3s.Volumes/argus/config diff --git a/services/Argus/persistentvolume-argus-data.yml b/services/Argus/persistentvolume-argus-data.yml deleted file mode 100644 index 798ceb1..0000000 --- a/services/Argus/persistentvolume-argus-data.yml +++ /dev/null @@ -1,19 +0,0 @@ ---- -apiVersion: v1 -kind: PersistentVolume -metadata: - name: flexvolsmb-argus-data -spec: - capacity: - storage: 1Gi - accessModes: - - ReadWriteMany - storageClassName: flexvolsmb-argus-data - flexVolume: - driver: mount/smb - secretRef: - name: flexvolsmb-credentials - options: - opts: file_mode=0777,dir_mode=0777,iocharset=utf8,nobrl - server: 192.168.154.195 - share: /K3s.Volumes/argus/data diff --git a/services/Argus/persistentvolume-csismb-argus-config.yaml b/services/Argus/persistentvolume-csismb-argus-config.yaml new file mode 100644 index 0000000..582f42f --- /dev/null +++ b/services/Argus/persistentvolume-csismb-argus-config.yaml @@ -0,0 +1,31 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + annotations: + pv.kubernetes.io/provisioned-by: smb.csi.k8s.io + name: csismb-argus-config +spec: + capacity: + storage: 1Gi + accessModes: + - ReadWriteMany + persistentVolumeReclaimPolicy: Retain + storageClassName: csismb-argus-config + mountOptions: + - dir_mode=0777 + - file_mode=0777 + - 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#argus#config + volumeAttributes: + source: //192.168.154.195/K3s.Volumes + subDir: argus/config + nodeStageSecretRef: + name: smb-credentials + namespace: argus diff --git a/services/Argus/persistentvolume-csismb-argus-data.yaml b/services/Argus/persistentvolume-csismb-argus-data.yaml new file mode 100644 index 0000000..318fcc8 --- /dev/null +++ b/services/Argus/persistentvolume-csismb-argus-data.yaml @@ -0,0 +1,31 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + annotations: + pv.kubernetes.io/provisioned-by: smb.csi.k8s.io + name: csismb-argus-data +spec: + capacity: + storage: 1Gi + accessModes: + - ReadWriteMany + persistentVolumeReclaimPolicy: Retain + storageClassName: csismb-argus-data + mountOptions: + - dir_mode=0777 + - file_mode=0777 + - 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#argus#data + volumeAttributes: + source: //192.168.154.195/K3s.Volumes + subDir: argus/data + nodeStageSecretRef: + name: smb-credentials + namespace: argus diff --git a/services/Argus/persistentvolumeclaim-argus-data.yml b/services/Argus/persistentvolumeclaim-csismb-argus-config.yaml similarity index 67% rename from services/Argus/persistentvolumeclaim-argus-data.yml rename to services/Argus/persistentvolumeclaim-csismb-argus-config.yaml index 84c105f..c58a4e5 100644 --- a/services/Argus/persistentvolumeclaim-argus-data.yml +++ b/services/Argus/persistentvolumeclaim-csismb-argus-config.yaml @@ -1,13 +1,12 @@ ---- apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: flexvolsmb-argus-data + name: csismb-argus-config namespace: argus spec: accessModes: - ReadWriteMany - storageClassName: flexvolsmb-argus-data + storageClassName: csismb-argus-config resources: requests: storage: 1Gi diff --git a/services/Argus/persistentvolumeclaim-argus-config.yml b/services/Argus/persistentvolumeclaim-csismb-argus-data.yaml similarity index 66% rename from services/Argus/persistentvolumeclaim-argus-config.yml rename to services/Argus/persistentvolumeclaim-csismb-argus-data.yaml index 23eed76..46328d8 100644 --- a/services/Argus/persistentvolumeclaim-argus-config.yml +++ b/services/Argus/persistentvolumeclaim-csismb-argus-data.yaml @@ -1,13 +1,12 @@ ---- apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: flexvolsmb-argus-config + name: csismb-argus-data namespace: argus spec: accessModes: - ReadWriteMany - storageClassName: flexvolsmb-argus-config + storageClassName: csismb-argus-data resources: requests: storage: 1Gi diff --git a/services/Argus/sealedsecret-flexvolsmb-credentials.yaml b/services/Argus/sealedsecret-flexvolsmb-credentials.yaml deleted file mode 100644 index 22cf4a1..0000000 --- a/services/Argus/sealedsecret-flexvolsmb-credentials.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - creationTimestamp: null - name: flexvolsmb-credentials - namespace: argus -spec: - encryptedData: - password: AgAs9RV1K8QyPLGXXc0+RBOqY3VKNMa4No51KIOv9keZJavJFSzQPcuaWXqpl0fVI9zYXLyIHdyRbXL0GrvYlWboR1VPskFNcp7MnCkzRpawgo4QfE9Q+WDI4yZg4eK/8XGejAjCQU/KsFU8dVWHuHG1/W8kV2dOvKIhX6FTirKMDedVDmdgojAPMGM8+smPfC8+yBs5O4+IZtGKOe8mEH2c/3dYu6GK5q9N6czBYMuj1E0b+8fHjlWjh6fe5DDCUGUXqY2BZCxMSKOZReUbWEdPNU6MtdTHNglVhRMo//6mlA2VVkAlB9uaCdGmCMs/VJ3pS8NEeTd86zukyoY+j3JHvRrHuxGVEoKqnFE9pEgO/UB4SyuVVWbNQ4+QXdyDTHgmArvd+MfRvtdj9Kkc18CWKXyRTj41lKG+C/vBM0ATt+hk4QvacEt65kZ+fY6TZHYJq6JluuDrwQmDKcuv44uL6t9/aGpzfGTx4OnZqxC/qvX0V4GhkRzwLLxMhqZa1ZbqgRXLHero10f4JvD/usmJcHZP1hgohUXbSlOqNSWIQk0weaZjTabT1xBxXjVzDBywnzcmixmJsOuuZuvYrbrsKaHNC6gcvZArj/no9Rv5V4mVihRfGuxJs++GCAfq3FdseuMCCvLe306henvSftvSjNNodc+JFJaTf3m4PknSYH9uEkV2CXGm2obRUpUNBUiJd9Icr/ug4jOzNmZNOlOC - username: AgCHpKikNpk3UAHuBA62jZSTdiVatTI8Qnmiu6LGhZYraks2h9gOtgjg6mukxXcy6IO6LKVr68DaxOfvYE4LdFQdrq0SI2syzofc4n+FCXn6f2HlBVhqOFGrVE9qUE36lKHJEFccvkirzhgpy2M8OX6KtwywTBvsVujzla5OXR19vgNao9jTzsOL98wQfU1TYyaBw9y45kyCB7x8PQNw78GmeWJ5KLVNXN/yHowE8Qmlvh86QV58NuTKC1rVbSqh3VnjnZuz/BSUUDV4GitZLqWKSZ5hZyPWC9DZXzUI85d8+BfHJ7hrPhBd7ehUpbpFQfIQQA1VNAZvOEXU5EClmd6iQ3fWrYo6hOxYZkiE/qcNkSLXmbWYBixq6s7RLJwHlxVNQt9J11XM5DY9OlA7XhPa9zo8FRrYDwkjQGahgA/AzwvIKpOBbVfCMSl+crm3jjQthEL3DN/6ZowYq5NXG9n6rhvOxTjvmqx9FP3RT5OyPFkXGCrTJ8JqPgxyp/Vy6si9bjiqzwJtXY6ZeyCFLW9mOdQmn2vgFxviDM8pxaBmOJFdbJNuiHV5Tc6iM9YBi3n3hTV/tbiMmKeVQSKydm5ZGsgD4/CJT4oDFynjhWObvYPLphb/hccM6m6c7Hf/i9FI1LOCk1cBRbyXRV9Cds92OljAx3YnaumyZ5eRgdROdAbcqqhjR48k/UCsY5tUv+LktyuzVqA= - template: - metadata: - creationTimestamp: null - name: flexvolsmb-credentials - namespace: argus - type: mount/smb diff --git a/services/Argus/sealedsecret-smb-credentials.yaml b/services/Argus/sealedsecret-smb-credentials.yaml new file mode 100644 index 0000000..d4ee2a1 --- /dev/null +++ b/services/Argus/sealedsecret-smb-credentials.yaml @@ -0,0 +1,16 @@ +apiVersion: bitnami.com/v1alpha1 +kind: SealedSecret +metadata: + creationTimestamp: null + name: smb-credentials + namespace: argus +spec: + encryptedData: + password: AgB8gU7Lj+Pn5B/oC8HtyKnKUzSvB7NRvxJOC2UmKjt3hj3pcRmfKrEh2khkcfSksb6x3f4ttIxYV2uFsXJfL4Wvi6zhsgvfgUHT12oD1/fuxD0LvHCm9otlGp8yyiQu5mPrFBdsGJswreBY53sD0UUdgu2riAlX0ESm+xKhzDJ6eSM8/Iz9Dq4GIhivLZ3OcZJw9hbgbelICIgvuxJZ3bWLfakPdeNDQUoayZuG3Z4GW0KPiqOMyaWz1/rljMHFaZHnFaszgKobwzPihsWWAnXEWmn54fwVBqfe/jNIo8CBvjlZGnMzinaS5lKTHObEVIG+F0XRI5VNFPa89NbsGKN71HJMFYU729lzdl58yy6B/5K789JRtxWUi/8I/7H8kLZWzUhUOqAcmLpVHKWnkH0Ub4MLtDyAaTJam5HqTtsvPDMW3+njiC+8vxC3n0X7q7pzAQQzM5JPZ7G/On6irFKe4LryfrphHiCB/gyJlLpBMXUqKJ4MvzUQU8G8e8W3OLMbtPl0O6oFuFxD8bUA4gdkoPO04bxlLvRmxlmavkbA0vFi60L6eyIOq5yzxvuEd7tzyD7SEO49hb8zW/LS/+H/PE/fCVT6crn+UbNOhgyaHR8pxlNpy6Z4PAti3mG8ZOtKVD0mx6fm8BCPHfWVFyC5YO6kNI285o4uuqsQI+SSZ+zkxwlFwvLcp1RdfJZFLUNyrQm3mlvMUY9xjZANlCHZ + username: AgB67La0V5HRLzZ1RqR0Y0nufYKq3z0SK/go4AQ0aaZwQEE/mIy0c6xhdkwup7ava4PzTyOavEEQoluhojOcrVTz9qKUHoMQHcnhS3NagBc/QCeA+2rL15qw9ZUn5+sSU4OhM3UNCTy2jF1kMoXr2cdCi9pALRdAXPLhrccPoaItmWkA4bMRIe3on78BQUOlhF+zJjcMciPlDo+9ywY8ArShMHj5YlRgWQ6uOJmIH5FFp2BcXKP5d0gALoVQ4/Ek4zIkk4YubtO1C0sqfbvkTW+oxeymUSLd2PddGyF18iohfrgje6PQAvvtkDBX2hUuVcp8h2oFj2JkeZld4neOYpDFbdKwe1aGep24GxbYIt24j+iFfs8txqXhQQsHJWJmwHNB2798gPvjIxPC+G90V4/drsjr7KiAgdWKUaqU5JMDVo2HTSplyWpS1LZIGQmloafWiAXvTWQVIEg2044TXQIq2X7k3npbHU/KcWmlMqR1546QawsZAnohWaOIskqEBkG7nXx/eeYk7LVppP2TqdRtt+VfuvptXgfFhkOB2wUSOwqWH7OkQu/k3jtPR0FVJni+Hc1/+fKfuStwvEX+/1bdjZuS8DUGelOb1d/pXrHw+KypfzXcOoDaO31hJMQOEalXZc2GNJleAvLAxv34s8fFWKWvnEXqwYIaNwRPvX64GtencJwyFo/rdO/HH7gVIhA2DCDQwB0= + template: + metadata: + creationTimestamp: null + name: smb-credentials + namespace: argus + type: Opaque