From 764a3eafb7dfeec4738ef5b9c0175b176cb67ff0 Mon Sep 17 00:00:00 2001 From: Remy Moll <me@moll.re> Date: Thu, 28 Mar 2024 12:40:48 +0100 Subject: [PATCH] switch some apps over to nfs-client --- apps/finance/actualbudget.deployment.yaml | 6 ++--- apps/finance/actualbudget.pvc.yaml | 18 ++------------ apps/homeassistant/deployment.yaml | 3 +-- apps/homeassistant/pvc.yaml | 21 ++-------------- apps/media/pvc.yaml | 29 ++++------------------- apps/media/server.deployment.yaml | 12 +++++----- apps/todos/pvc.yaml | 21 ++++------------ apps/todos/values.yaml | 2 +- 8 files changed, 24 insertions(+), 88 deletions(-) diff --git a/apps/finance/actualbudget.deployment.yaml b/apps/finance/actualbudget.deployment.yaml index 1eb63dc..a5df3c7 100644 --- a/apps/finance/actualbudget.deployment.yaml +++ b/apps/finance/actualbudget.deployment.yaml @@ -22,13 +22,13 @@ spec: - name: TZ value: Europe/Berlin volumeMounts: - - name: actualbudget-data-nfs + - name: data mountPath: /data ports: - containerPort: 5006 name: http protocol: TCP volumes: - - name: actualbudget-data-nfs + - name: data persistentVolumeClaim: - claimName: actualbudget-data-nfs + claimName: data diff --git a/apps/finance/actualbudget.pvc.yaml b/apps/finance/actualbudget.pvc.yaml index 6551e98..050a7a0 100644 --- a/apps/finance/actualbudget.pvc.yaml +++ b/apps/finance/actualbudget.pvc.yaml @@ -1,25 +1,11 @@ apiVersion: v1 -kind: PersistentVolume -metadata: - name: "actualbudget-data-nfs" -spec: - capacity: - storage: "5Gi" - accessModes: - - ReadWriteOnce - nfs: - path: /export/kluster/actualbudget - server: 192.168.1.157 ---- -apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: "actualbudget-data-nfs" + name: "data" spec: - storageClassName: "" + storageClassName: "nfs-client" accessModes: - ReadWriteOnce resources: requests: storage: "5Gi" - volumeName: actualbudget-data-nfs diff --git a/apps/homeassistant/deployment.yaml b/apps/homeassistant/deployment.yaml index b65d613..63eb84f 100644 --- a/apps/homeassistant/deployment.yaml +++ b/apps/homeassistant/deployment.yaml @@ -1,4 +1,3 @@ - apiVersion: apps/v1 kind: Deployment metadata: @@ -34,4 +33,4 @@ spec: volumes: - name: config persistentVolumeClaim: - claimName: homeassistant-nfs + claimName: config diff --git a/apps/homeassistant/pvc.yaml b/apps/homeassistant/pvc.yaml index 966c96f..a51f019 100644 --- a/apps/homeassistant/pvc.yaml +++ b/apps/homeassistant/pvc.yaml @@ -1,28 +1,11 @@ ---- -apiVersion: v1 -kind: PersistentVolume -metadata: - name: homeassistant-nfs -spec: - # storageClassName: slow - capacity: - storage: "1Gi" - # volumeMode: Filesystem - accessModes: - - ReadWriteOnce - nfs: - path: /kluster/homeassistant - server: 192.168.1.157 ---- apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: homeassistant-nfs + name: config spec: - storageClassName: "" + storageClassName: "nfs-client" accessModes: - ReadWriteOnce resources: requests: storage: "1Gi" - volumeName: homeassistant-nfs diff --git a/apps/media/pvc.yaml b/apps/media/pvc.yaml index c78e585..07f5b16 100644 --- a/apps/media/pvc.yaml +++ b/apps/media/pvc.yaml @@ -1,39 +1,21 @@ - -apiVersion: v1 -kind: PersistentVolume -metadata: - namespace: media - name: jellyfin-config-nfs -spec: - capacity: - storage: "1Gi" - accessModes: - - ReadWriteOnce - nfs: - path: /export/kluster/jellyfin-config - server: 192.168.1.157 ---- apiVersion: v1 kind: PersistentVolumeClaim metadata: - namespace: media - name: jellyfin-config-nfs + name: config spec: - storageClassName: "" + storageClassName: "nfs-client" accessModes: - ReadWriteOnce resources: requests: storage: "1Gi" - volumeName: jellyfin-config-nfs --- apiVersion: v1 kind: PersistentVolume metadata: - namespace: media - name: jellyfin-data-nfs + name: media spec: capacity: storage: "1Ti" @@ -46,8 +28,7 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - namespace: media - name: jellyfin-data-nfs + name: media spec: storageClassName: "" accessModes: @@ -55,4 +36,4 @@ spec: resources: requests: storage: "1Ti" - volumeName: jellyfin-data-nfs + volumeName: media diff --git a/apps/media/server.deployment.yaml b/apps/media/server.deployment.yaml index 0168fa7..55effef 100644 --- a/apps/media/server.deployment.yaml +++ b/apps/media/server.deployment.yaml @@ -25,9 +25,9 @@ spec: - name: TZ value: Europe/Berlin volumeMounts: - - name: jellyfin-config + - name: config mountPath: /config - - name: jellyfin-data + - name: media mountPath: /media livenessProbe: httpGet: @@ -36,10 +36,10 @@ spec: initialDelaySeconds: 100 periodSeconds: 15 volumes: - - name: jellyfin-config + - name: config persistentVolumeClaim: - claimName: jellyfin-config-nfs - - name: jellyfin-data + claimName: config + - name: media persistentVolumeClaim: - claimName: jellyfin-data-nfs + claimName: media diff --git a/apps/todos/pvc.yaml b/apps/todos/pvc.yaml index 14f4252..e1e84e5 100644 --- a/apps/todos/pvc.yaml +++ b/apps/todos/pvc.yaml @@ -1,26 +1,13 @@ 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-data + name: data spec: resources: requests: - storage: 1Gi + storage: 5Gi volumeMode: Filesystem - storageClassName: "" + storageClassName: "nfs-client" accessModes: - ReadWriteOnce - volumeName: todos-data + volumeName: data diff --git a/apps/todos/values.yaml b/apps/todos/values.yaml index ad4f64f..d2f63c1 100644 --- a/apps/todos/values.yaml +++ b/apps/todos/values.yaml @@ -11,7 +11,7 @@ api: # the chart create a new PVC for you or provide an existing one. data: enabled: true - existingClaim: todos-data + existingClaim: data accessMode: ReadWriteOnce size: 10Gi mountPath: /app/vikunja/files