From dd92793d98b05761f63890af296b8acf5c135c55 Mon Sep 17 00:00:00 2001 From: Danny Bessems Date: Tue, 8 Jul 2025 20:42:24 +1000 Subject: [PATCH] Added csi-driver-smb storage provider; Added sealed-secrets --- services/Minecraft/values.yaml | 29 ----------------- .../application-csi-driver-smb.yaml | 3 ++ .../sealedsecret-smb-credentials.yaml | 15 --------- .../csi-driver-smb/storageclass-smb-csi.yaml | 23 ------------- storage/flexVolSMB/daemonSet-flexVolSMB.yml | 32 ------------------- .../flexVolSMB/sealedSecret-flexVolSMB.yml | 24 -------------- ...application-sealed-secrets-controller.yaml | 14 ++++---- 7 files changed, 11 insertions(+), 129 deletions(-) delete mode 100644 services/Minecraft/values.yaml delete mode 100644 storage/csi-driver-smb/sealedsecret-smb-credentials.yaml delete mode 100644 storage/csi-driver-smb/storageclass-smb-csi.yaml delete mode 100644 storage/flexVolSMB/daemonSet-flexVolSMB.yml delete mode 100644 storage/flexVolSMB/sealedSecret-flexVolSMB.yml rename services/Minecraft/application-minecraft-bedrock.yaml => system/SealedSecrets/application-sealed-secrets-controller.yaml (56%) diff --git a/services/Minecraft/values.yaml b/services/Minecraft/values.yaml deleted file mode 100644 index fdeb5a1..0000000 --- a/services/Minecraft/values.yaml +++ /dev/null @@ -1,29 +0,0 @@ -minecraftServer: - # version: 1.21.73.01 - - eula: "true" - serverName: Clydebank Rd Survival - - serviceType: LoadBalancer - loadBalancerIP: 192.168.154.241 - - cheats: true - - ops: "2533274801327950" - -persistence: - storageClass: "smb-csi" - dataDir: - enabled: true - Size: 1Gi - accessModes: - - ReadWriteOnce - -resources: - requests: - memory: 1024Mi - cpu: 500m - -extraEnv: - ENABLE_ROLLING_LOGS: true - OVERRIDE_SERVER_PROPERTIES: true diff --git a/storage/csi-driver-smb/application-csi-driver-smb.yaml b/storage/csi-driver-smb/application-csi-driver-smb.yaml index 9603e1e..ab14d8c 100644 --- a/storage/csi-driver-smb/application-csi-driver-smb.yaml +++ b/storage/csi-driver-smb/application-csi-driver-smb.yaml @@ -11,6 +11,9 @@ spec: syncPolicy: automated: {} sources: + # - repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog + # path: storage/csi-driver-smb/manifests + # targetRevision: HEAD - repoURL: https://raw.githubusercontent.com/kubernetes-csi/csi-driver-smb/master/charts chart: csi-driver-smb targetRevision: v1.18.0 diff --git a/storage/csi-driver-smb/sealedsecret-smb-credentials.yaml b/storage/csi-driver-smb/sealedsecret-smb-credentials.yaml deleted file mode 100644 index 98efced..0000000 --- a/storage/csi-driver-smb/sealedsecret-smb-credentials.yaml +++ /dev/null @@ -1,15 +0,0 @@ -apiVersion: bitnami.com/v1alpha1 -kind: SealedSecret -metadata: - name: smb-credentials - namespace: default -spec: - encryptedData: - password: AgCkOReg8deCpkzUQj+J6XjMKcHUXwzg5AM2Y68CrC1gNgWSWhVKONX5UruNemJ773ZmgRDdDbIwQUBanLUByMbo4y3/kVnwgJCOADD+ERo30ysbdei+SNIIgg55J8R8nU/H31GFWYdq8Ck3FPNvBXo9uMHyUzqopZm8iOV2YVNA0kx9J1uArpzzc1bx3ZA2sV1Rcg9FtLvPErd7WEn5xdosC2Jtxl8NpMFEU32CiKJVM0h4GjmT5uyEOEYeVBURqRB73QfwS7rIRGGCfV8Px6ByF+ADZQ++0Vdla+kWLfsbTW6qcnDv6rqTc8MtXCfYDC3eWKnNvVgI7aNyyWNntQ1qlgW4o3kBNJm33HEU8lxWtgbt8L+g6l/x/ECRsb2EDJWa15VkEJr2WyghkM9WrgL+C0sVwxjOSPcbiZyk2VLfKL02NN4sJ8GQxVW1AvE6MM+YrPD/9o6YaQkOjI6IbZThpDnGGM3n+VQvUB3mSBR1cC9DNjssbzZOJiMm11OfW3Pfw2blyCzO8swM0RN+pO1+8/63uFh6y3hzYuW/6XkHY1bp2EqBRvpaCsjiJfLg+zhPGKz0Lv7L6GzCaXolxWGrdkTiPVpTKvQl1rW5HhWEYz5W+djRZTSX0Kimu3sawI0riPvJyD+6ANHGvHnW8ioONuv3/TXuCs5As2f9V8PikR8jeEGr5YJQOwnXTXaVd/5Yg7ulVXltLnFZ2fa3jYkW - username: AgAUu6XbTsHoS33fRV9N31CxHildp0XrnrDkT3UuJQKIx8c/GmUy6LZK1/yWD4hwco0DY6BmDMUUXdJQQDE5aYLBADRq5EobwlyuBgHP2pAhncV750e+u0VhWsCg0AREjLJA4P9xN61Qpbw7w1Yfi6OBjFhzKw4e0YyG3D7EoA2Q9+0dQrkPf3ooLJBx6SE/NuVs7uTuKWi2hC+kuKp3WhgrTU9IG+r1UFOO2jPR9ZFtsHaIArDzgbYZ03dFAXuTFjFLLx519/vCMXKKOglUsTzzaZUb798u3zG1xic+nZIvt6OmjyB86QZ+mjRAElVRINZRUJEMPbWkP2frbN1caQnPvX28LGcRiP0wFM+tgJG/3tAu9T1kaYnLFx+g8wex/kYqI0xktFJb2aisEb32Dhr4S883gpvvEouxuY/Y1g0ZuKxuS7tL8SE3i8x6GBFGaqLx+Wp60G2LsHDDn1PRqZ/GRlPci6QnAwScMPRuHbZOkyQem5w7n5t+LkoYq/gQ/hI+kiyEJOT7XqgR0iCsGGqsLQrVuP1M4XaZQEMlXl8q/iw4N7B28XMDAvWKF02jPM1XsCXMi5ins20KjzHwriMZA0CR7LWyBQsp88phQ/JNqTkEYa+AMdL2zVrhKYao7GvbYs15i3dcuZR08Lof2QIkeLe96DVKb3z6cqqRkbCxlErmD2M8BKhS3TXcNRhSgMReFUqTUAU= - template: - metadata: - creationTimestamp: null - name: smb-credentials - namespace: default - type: Opaque diff --git a/storage/csi-driver-smb/storageclass-smb-csi.yaml b/storage/csi-driver-smb/storageclass-smb-csi.yaml deleted file mode 100644 index 98f4e36..0000000 --- a/storage/csi-driver-smb/storageclass-smb-csi.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: smb-csi -mountOptions: -- dir_mode=0777 -- file_mode=0777 -- uid=1001 -- gid=1001 -- nobrl -- noperm -- mfsymlinks -- cache=strict -- noserverino -parameters: - csi.storage.k8s.io/node-stage-secret-name: smb-credentials - csi.storage.k8s.io/node-stage-secret-namespace: default - csi.storage.k8s.io/provisioner-secret-name: smb-credentials - csi.storage.k8s.io/provisioner-secret-namespace: default - source: //192.168.154.195/K3s.StorageClass/smb-csi -provisioner: smb.csi.k8s.io -reclaimPolicy: Retain -volumeBindingMode: Immediate diff --git a/storage/flexVolSMB/daemonSet-flexVolSMB.yml b/storage/flexVolSMB/daemonSet-flexVolSMB.yml deleted file mode 100644 index 6f8584a..0000000 --- a/storage/flexVolSMB/daemonSet-flexVolSMB.yml +++ /dev/null @@ -1,32 +0,0 @@ -apiVersion: apps/v1 -kind: DaemonSet -metadata: - name: juliohm-cifs-volumedriver-installer -spec: - selector: - matchLabels: - app: juliohm-cifs-volumedriver-installer - template: - metadata: - name: juliohm-cifs-volumedriver-installer - labels: - app: juliohm-cifs-volumedriver-installer - spec: - containers: - - image: juliohm/kubernetes-cifs-volumedriver-installer:2.3 - name: flex-deploy - imagePullPolicy: Always - env: - - name: VENDOR - value: mount - - name: DRIVER - value: smb - securityContext: - privileged: true - volumeMounts: - - mountPath: /flexmnt - name: flexvolume-mount - volumes: - - name: flexvolume-mount - hostPath: - path: /usr/libexec/kubernetes/kubelet-plugins/volume/exec/ diff --git a/storage/flexVolSMB/sealedSecret-flexVolSMB.yml b/storage/flexVolSMB/sealedSecret-flexVolSMB.yml deleted file mode 100644 index b121057..0000000 --- a/storage/flexVolSMB/sealedSecret-flexVolSMB.yml +++ /dev/null @@ -1,24 +0,0 @@ -{ - "kind": "SealedSecret", - "apiVersion": "bitnami.com/v1alpha1", - "metadata": { - "name": "smb-secret", - "namespace": "default", - "creationTimestamp": null - }, - "spec": { - "template": { - "metadata": { - "name": "smb-secret", - "namespace": "default", - "creationTimestamp": null - }, - "type": "mount/smb", - "data": null - }, - "encryptedData": { - "password": "AgAc4U308eDKdXvtSA+xsgtztue+k6BnHvlLBZR18S09bNfCf592MtlVrgmZpoC7ib67jigiEUx2bVteoO05ZBOams/A2EwrzufnS4FySzTA5ttVe5HB4n5FuXNComafBKtsPapk4s6o6NgAEnzmI8Kw00/UgxhA4fcoRu5hVc7QNiN2J2aIcCjhLNHcoEZcWckJcrlpFtCySC3VfeOAaCyhfJeAlor70m4rHJe8cS45QD/b+KtRuRJkYCw7SEdRPj31emPEViddd0HYjPe0ZvUnl0nEi3T7ygR+rLaPGDAoatFbCNI7kXE0hOXFUuoX0DPmNXxf3dRMWspdiPSzbmQQKLiTIrpD+izalYaVmNF3jp37vqP4VUOxhO4S4EJCLskwqNK2yuottjEAvQgCwdpZg2w/ORmKFtvbk7qHQ1vn3sxO7oVumMf9g+WMPYc2y5nlSN1eb4rwsmTY48hsxFTTmNajBjKCmzN3s/Pjqc+KP2fiA1qHvwS+mMppTvbCyzQnufS+1EBoMbS8RjLcuEBtcVleIguRu+JdjayE8sm2foUKEFVayk2wH2JsSyCB9sldRYqvF02PdOn9goDuTPv2ISpnaxCys+dFmgtF/T9eLOhE3TC/1DZ9zH+xfa4FK9X6qWhVxtPyoK1KhdzBvraAXXo2P8vRZEHE7GOhKMDpQxAIBWWumWyhad2IoHiFkXwstGMjJtHTTAf37MhJJCel", - "username": "AgC5iMAylyIRum5JP4SVF5w97VbCPVMIs4+lMv3UWkK66EnDfl0Vm7IVGs9iWSRh9pEjYItG2cfc/kPfpyJUcg82iUuq5DijiWIyPI4Vy4XE1x0LTVyNuTjewMzVnd4yaz4ovBR8p6x1TivNMCmQk2+tHEIe31Xq1TPDN3fP+9X619v6P37sZkMJH9EAGI+bLeD055j+Bln2lzicgkitNNi97iMmgIG7gl7YARjxelmUCoRDjBQh5jhMB9zSDGapBXp7MWto0D1N31g7g22IzpCiY1ZkceeH9yFzy69gf7RusS+q5VQ6JNUZmnfvwwua6t3I0RT6nPR8tQKe9ifzlqBaX0KxVdnUJ8T1r1/ab+k5PP6/O53qiVE7IYfQs5jD9haibezbYiLbEvVjIkVDMGaUlf20fB+oaqt0q5xIhOXrpCCyUFYnHGjVo/NntdrqJzlMdmo7jsUBfJlxzJkovtvA7r0OZocEB4rAOUWOSdOK2eaXrhE09pzO0NHhG93XWf+rT2YR1C7nMMP6iGtwm9iFD6JMM4GwDurO6RiUoOIYmJwIoUtrsySffGCcbJCQW7Ysoh5puoFhzb0dWbnmptIMMN8pCqYXBgvIMKqWEIE/Yoff+It2VJ0vKua18uKmX0ucBeZzgUHBll2xyuADaMqeV9melv/a+lNP+s32x/vzCv91D4yQvaPhVeDmRG2e3LsVf95c514=" - } - } -} diff --git a/services/Minecraft/application-minecraft-bedrock.yaml b/system/SealedSecrets/application-sealed-secrets-controller.yaml similarity index 56% rename from services/Minecraft/application-minecraft-bedrock.yaml rename to system/SealedSecrets/application-sealed-secrets-controller.yaml index 1b9ab63..8185668 100644 --- a/services/Minecraft/application-minecraft-bedrock.yaml +++ b/system/SealedSecrets/application-sealed-secrets-controller.yaml @@ -1,20 +1,22 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: minecraft-bedrock + name: sealed-secrets-controller namespace: argo-cd spec: destination: server: https://kubernetes.default.svc - namespace: minecraft + namespace: kube-system project: default + syncPolicy: + automated: {} sources: - - repoURL: https://itzg.github.io/minecraft-server-charts/ - chart: minecraft-bedrock - targetRevision: 2.8.4 + - repoURL: https://bitnami-labs.github.io/sealed-secrets + chart: sealed-secrets + targetRevision: 2.17.3 helm: valueFiles: - - $values/services/Minecraft/values.yaml + - $values/system/SealedSecrets/values.yaml - repoURL: https://code.spamasaurus.com/djpbessems/Kubernetes.K3s.installLog targetRevision: master ref: values