From f64806430481b20f50acd5cfa0dfa3b7ce444b91 Mon Sep 17 00:00:00 2001 From: Remy Moll Date: Tue, 26 Mar 2024 23:50:27 +0100 Subject: [PATCH] remove nfs-client --- apps/finance/actualbudget.pvc.yaml | 2 -- apps/immich/postgres.yaml | 7 +++++-- apps/immich/pvc.yaml | 14 +++++++++++++ apps/ocis/pvc.yaml | 16 +++++++++++++- apps/recipes/pvc.yaml | 16 +++++++++++++- apps/rss/pvc.yaml | 16 +++++++++++++- apps/syncthing/pvc.yaml | 16 +++++++++++++- apps/todos/pvc.yaml | 16 +++++++++++++- infrastructure/backup/postgres/pvc.yaml | 16 +++++++++++++- infrastructure/nfs-provisioner/README.md | 20 ------------------ .../nfs-provisioner/kustomization.yaml | 12 ----------- infrastructure/nfs-provisioner/namespace.yaml | 4 ---- .../nfs-provisioner/nfs_values.yaml | 21 ------------------- .../nfs-provisioner/storageclass_values.yaml | 7 ------- kluster-deployments/kustomization.yaml | 1 - .../nfs-provisioner/application.yaml | 18 ---------------- .../nfs-provisioner/kustomization.yaml | 4 ---- 17 files changed, 109 insertions(+), 97 deletions(-) delete mode 100644 infrastructure/nfs-provisioner/README.md delete mode 100644 infrastructure/nfs-provisioner/kustomization.yaml delete mode 100644 infrastructure/nfs-provisioner/namespace.yaml delete mode 100644 infrastructure/nfs-provisioner/nfs_values.yaml delete mode 100644 infrastructure/nfs-provisioner/storageclass_values.yaml delete mode 100644 kluster-deployments/nfs-provisioner/application.yaml delete mode 100644 kluster-deployments/nfs-provisioner/kustomization.yaml diff --git a/apps/finance/actualbudget.pvc.yaml b/apps/finance/actualbudget.pvc.yaml index b138777..6551e98 100644 --- a/apps/finance/actualbudget.pvc.yaml +++ b/apps/finance/actualbudget.pvc.yaml @@ -10,7 +10,6 @@ spec: nfs: path: /export/kluster/actualbudget server: 192.168.1.157 - --- apiVersion: v1 kind: PersistentVolumeClaim @@ -23,5 +22,4 @@ spec: resources: requests: storage: "5Gi" - volumeName: actualbudget-data-nfs diff --git a/apps/immich/postgres.yaml b/apps/immich/postgres.yaml index 202c146..25d2412 100644 --- a/apps/immich/postgres.yaml +++ b/apps/immich/postgres.yaml @@ -19,7 +19,10 @@ spec: storage: size: 1Gi - storageClass: nfs-client - + persistentVolumeClaim: + storageClassName: "" + accessModes: + - ReadWriteOnce + volumeName: immich-postgres monitoring: enablePodMonitor: true diff --git a/apps/immich/pvc.yaml b/apps/immich/pvc.yaml index 6955936..797c6da 100644 --- a/apps/immich/pvc.yaml +++ b/apps/immich/pvc.yaml @@ -24,3 +24,17 @@ spec: requests: storage: "50Gi" volumeName: immich-nfs +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: immich-postgres +spec: + capacity: + storage: "1Gi" + accessModes: + - ReadWriteOnce + nfs: + path: /kluster/immich-postgres + server: 192.168.1.157 +# later used by cnpg \ No newline at end of file diff --git a/apps/ocis/pvc.yaml b/apps/ocis/pvc.yaml index 6eb8172..86d5156 100644 --- a/apps/ocis/pvc.yaml +++ b/apps/ocis/pvc.yaml @@ -1,11 +1,25 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: ocis-data +spec: + capacity: + storage: "50Gi" + accessModes: + - ReadWriteOnce + nfs: + path: /kluster/ocis + server: 192.168.1.157 +--- kind: PersistentVolumeClaim apiVersion: v1 metadata: name: ocis-data spec: - storageClassName: nfs-client + storageClassName: "" accessModes: - ReadWriteOnce resources: requests: storage: 100Gi + volumeName: ocis-data diff --git a/apps/recipes/pvc.yaml b/apps/recipes/pvc.yaml index 406ced3..1acce4c 100644 --- a/apps/recipes/pvc.yaml +++ b/apps/recipes/pvc.yaml @@ -1,4 +1,17 @@ apiVersion: v1 +kind: PersistentVolume +metadata: + name: mealie-data +spec: + capacity: + storage: "50Gi" + accessModes: + - ReadWriteOnce + nfs: + path: /kluster/mealie + server: 192.168.1.157 +--- +apiVersion: v1 kind: PersistentVolumeClaim metadata: name: mealie-data @@ -7,6 +20,7 @@ spec: requests: storage: 1Gi volumeMode: Filesystem - storageClassName: nfs-client + storageClassName: "" accessModes: - ReadWriteOnce + volumeName: mealie-data diff --git a/apps/rss/pvc.yaml b/apps/rss/pvc.yaml index ae430f7..8d72fe4 100644 --- a/apps/rss/pvc.yaml +++ b/apps/rss/pvc.yaml @@ -1,11 +1,25 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: rss-data +spec: + capacity: + storage: "50Gi" + accessModes: + - ReadWriteOnce + nfs: + path: /kluster/rss + server: 192.168.1.157 +--- kind: PersistentVolumeClaim apiVersion: v1 metadata: name: rss-claim spec: - storageClassName: nfs-client + storageClassName: "" accessModes: - ReadWriteOnce resources: requests: storage: 1Gi + volumeName: rss-data diff --git a/apps/syncthing/pvc.yaml b/apps/syncthing/pvc.yaml index 5a1de47..dd82f08 100644 --- a/apps/syncthing/pvc.yaml +++ b/apps/syncthing/pvc.yaml @@ -1,11 +1,25 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: syncthing-data +spec: + capacity: + storage: "50Gi" + accessModes: + - ReadWriteOnce + nfs: + path: /kluster/syncthing + server: 192.168.1.157 +--- kind: PersistentVolumeClaim apiVersion: v1 metadata: name: syncthing-claim spec: - storageClassName: nfs-client + storageClassName: "" accessModes: - ReadWriteOnce resources: requests: storage: 10Gi + volumeName: syncthing \ No newline at end of file diff --git a/apps/todos/pvc.yaml b/apps/todos/pvc.yaml index fd21cba..ef93a3c 100644 --- a/apps/todos/pvc.yaml +++ b/apps/todos/pvc.yaml @@ -1,4 +1,17 @@ apiVersion: v1 +kind: PersistentVolume +metadata: + name: todos-data +spec: + capacity: + storage: "50Gi" + accessModes: + - ReadWriteOnce + nfs: + path: /kluster/todos + server: 192.168.1.157 +--- +apiVersion: v1 kind: PersistentVolumeClaim metadata: name: todos-nfs @@ -7,6 +20,7 @@ spec: requests: storage: 1Gi volumeMode: Filesystem - storageClassName: nfs-client + storageClassName: "" accessModes: - ReadWriteOnce + volumeName: todos-data diff --git a/infrastructure/backup/postgres/pvc.yaml b/infrastructure/backup/postgres/pvc.yaml index 6e0b186..c060001 100644 --- a/infrastructure/backup/postgres/pvc.yaml +++ b/infrastructure/backup/postgres/pvc.yaml @@ -1,3 +1,16 @@ +apiVersion: v1 +kind: PersistentVolume +metadata: + name: pg-backup-data +spec: + capacity: + storage: "50Gi" + accessModes: + - ReadWriteOnce + nfs: + path: /kluster/pg-backup + server: 192.168.1.157 +--- kind: PersistentVolumeClaim apiVersion: v1 @@ -5,9 +18,10 @@ metadata: name: postgres-backup-claim spec: - storageClassName: nfs-client + storageClassName: "" accessModes: - ReadWriteOnce resources: requests: storage: 10Gi + volumeName: pg-backup-data diff --git a/infrastructure/nfs-provisioner/README.md b/infrastructure/nfs-provisioner/README.md deleted file mode 100644 index a1e40d2..0000000 --- a/infrastructure/nfs-provisioner/README.md +++ /dev/null @@ -1,20 +0,0 @@ -## How to use -This deployment exposes a `StorageClass` named `nfs-client` that can be used to create `PersistentVolumeClaim` resources: - - -``` -kind: PersistentVolumeClaim -apiVersion: v1 -metadata: - name: test-claim - namespace: test-namespace -spec: - storageClassName: nfs-client - accessModes: - - ReadWriteMany - resources: - requests: - storage: 1Mi -``` - -This will create a new folder in the NFS server under `/test-namespace-test-claim` and mount it. diff --git a/infrastructure/nfs-provisioner/kustomization.yaml b/infrastructure/nfs-provisioner/kustomization.yaml deleted file mode 100644 index 169f0af..0000000 --- a/infrastructure/nfs-provisioner/kustomization.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization - -namespace: nfs-provisioner - -resources: - - github.com/kubernetes-sigs/nfs-subdir-external-provisioner//deploy - - namespace.yaml - -patches: - - path: nfs_values.yaml - - path: storageclass_values.yaml diff --git a/infrastructure/nfs-provisioner/namespace.yaml b/infrastructure/nfs-provisioner/namespace.yaml deleted file mode 100644 index 0a074bd..0000000 --- a/infrastructure/nfs-provisioner/namespace.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: v1 -kind: Namespace -metadata: - name: placeholder diff --git a/infrastructure/nfs-provisioner/nfs_values.yaml b/infrastructure/nfs-provisioner/nfs_values.yaml deleted file mode 100644 index 95dfd9c..0000000 --- a/infrastructure/nfs-provisioner/nfs_values.yaml +++ /dev/null @@ -1,21 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - labels: - app: nfs-client-provisioner - name: nfs-client-provisioner -spec: - template: - spec: - containers: - - name: nfs-client-provisioner - env: - - name: NFS_SERVER - value: 192.168.1.157 - - name: NFS_PATH - value: /export/kluster/ - volumes: - - name: nfs-client-root - nfs: - server: 192.168.1.157 - path: /export/kluster/ \ No newline at end of file diff --git a/infrastructure/nfs-provisioner/storageclass_values.yaml b/infrastructure/nfs-provisioner/storageclass_values.yaml deleted file mode 100644 index 1f14f81..0000000 --- a/infrastructure/nfs-provisioner/storageclass_values.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: nfs-client -parameters: - archiveOnDelete: "true" - pathPattern: "${.PVC.namespace}-${.PVC.name}" diff --git a/kluster-deployments/kustomization.yaml b/kluster-deployments/kustomization.yaml index 9564cbb..bc75bd8 100644 --- a/kluster-deployments/kustomization.yaml +++ b/kluster-deployments/kustomization.yaml @@ -11,7 +11,6 @@ resources: # infrastructure apps - projects.yaml - - nfs-provisioner/ - backup/ - pg-ha/ - gitea/ diff --git a/kluster-deployments/nfs-provisioner/application.yaml b/kluster-deployments/nfs-provisioner/application.yaml deleted file mode 100644 index 9cef01d..0000000 --- a/kluster-deployments/nfs-provisioner/application.yaml +++ /dev/null @@ -1,18 +0,0 @@ -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: nfs-provisioner-application - namespace: argocd -spec: - project: infrastructure - source: - repoURL: git@github.com:moll-re/bootstrap-k3s-infra.git - targetRevision: main - path: infrastructure/nfs-provisioner/ - destination: - server: https://kubernetes.default.svc - namespace: nfs-provisioner - syncPolicy: - automated: - prune: true - selfHeal: true diff --git a/kluster-deployments/nfs-provisioner/kustomization.yaml b/kluster-deployments/nfs-provisioner/kustomization.yaml deleted file mode 100644 index 1f43d0d..0000000 --- a/kluster-deployments/nfs-provisioner/kustomization.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- application.yaml