smb

fileserver/persistent-volumes.yaml

@@ -0,0 +1,79 @@
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: music
+  namespace: fileserver
+spec:
+  storageClassName: smb
+  capacity:
+    storage: 200Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - dir_mode=0777
+    - file_mode=0777
+    - vers=3.0
+  csi:
+    driver: smb.csi.k8s.io
+    readOnly: false
+    volumeHandle: "music"  # make sure it's a unique id in the cluster
+    volumeAttributes:
+      source: "//samba.fileserver.svc.k8s.undercloud.local./data##"
+    nodeStageSecretRef:
+      name: fileserver-smb-account
+      namespace: fileserver
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: movies
+  namespace: fileserver
+spec:
+  storageClassName: smb
+  capacity:
+    storage: 200Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - dir_mode=0777
+    - file_mode=0777
+    - vers=3.0
+  csi:
+    driver: smb.csi.k8s.io
+    readOnly: false
+    volumeHandle: "movies"  # make sure it's a unique id in the cluster
+    volumeAttributes:
+      source: "//samba.fileserver.svc.k8s.undercloud.local./data##"
+    nodeStageSecretRef:
+      name: fileserver-smb-account
+      namespace: fileserver
+---
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: tvshows
+  namespace: fileserver
+spec:
+  storageClassName: smb
+  capacity:
+    storage: 200Gi
+  accessModes:
+    - ReadWriteMany
+  persistentVolumeReclaimPolicy: Retain
+  mountOptions:
+    - dir_mode=0777
+    - file_mode=0777
+    - vers=3.0
+  csi:
+    driver: smb.csi.k8s.io
+    readOnly: false
+    volumeHandle: "tvshows"  # make sure it's a unique id in the cluster
+    volumeAttributes:
+      source: "//samba.fileserver.svc.k8s.undercloud.local./data##"
+    nodeStageSecretRef:
+      name: fileserver-smb-account
+      namespace: fileserver
+---

fileserver/samba.yaml

@@ -35,7 +35,8 @@ spec:
           - bash
           - -c
           - |
-            mkdir -p /data/music /data/movies /data/tvshows /data/data
+            #mkdir -p /data/music /data/movies /data/tvshows /data/data
+            mkdir -p /data
             chmod -R 0777 /data
         volumeMounts:
         - mountPath: /data
@@ -50,14 +51,14 @@ spec:
         env:
         - name: SHARE
           value: "data;/data;yes;no;no;admin"
-        - name: SHARE2
-          value: "music;/data/music;yes;no;no;admin"
-        - name: SHARE3
-          value: "movies;/data/movies;yes;no;no;admin"
-        - name: SHARE4
-          value: "tvshows;/data/tvshows;yes;no;no;admin"
-        - name: SHARE5
-          value: "data;/data/data;yes;no;no;admin"
+        #- name: SHARE2
+        #  value: "music;/data/music;yes;no;no;admin"
+        #- name: SHARE3
+        #  value: "movies;/data/movies;yes;no;no;admin"
+        #- name: SHARE4
+        #  value: "tvshows;/data/tvshows;yes;no;no;admin"
+        #- name: SHARE5
+          value: "data;/data;yes;no;no;admin"
         - name: USER
           value: "admin;4IsTheMindKiller"
         volumeMounts:

fileserver/secrets.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: fileserver-smb-account
-  namespace: jellyfin
+  namespace: fileserver
 type: Opaque
 data:
   username: YWRtaW4=

fileserver/storageclass.yaml

@@ -0,0 +1,21 @@
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: smb
+provisioner: smb.csi.k8s.io
+parameters:
+  source: //samba.fileserver.svc.k8s.undercloud.local./data
+  # if csi.storage.k8s.io/provisioner-secret is provided, will create a sub directory
+  # with PV name under source
+  csi.storage.k8s.io/provisioner-secret-name: fileserver-smb-account
+  csi.storage.k8s.io/provisioner-secret-namespace: fileserver
+  csi.storage.k8s.io/node-stage-secret-name: fileserver-smb-account
+  csi.storage.k8s.io/node-stage-secret-namespace: fileserver
+reclaimPolicy: Delete  # available values: Delete, Retain
+volumeBindingMode: Immediate
+allowVolumeExpansion: true
+mountOptions:
+  - dir_mode=0777
+  - file_mode=0777
+  - uid=1001
+  - gid=1001

jellyfin/jellyfin.yaml

@@ -181,31 +181,19 @@ spec:
       storage: 8Gi
   storageClassName: cephfs-hyper
 ---
+kind: PersistentVolumeClaim
 apiVersion: v1
-kind: PersistentVolume
 metadata:
-  name: music-jelly
+  name: tvshows
   namespace: jellyfin
 spec:
-  storageClassName: ""
-  capacity:
-    storage: 32Gi
   accessModes:
     - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  mountOptions:
-    - dir_mode=0777
-    - file_mode=0777
-    - vers=3.0
-  csi:
-    driver: smb.csi.k8s.io
-    readOnly: false
-    volumeHandle: "music"  # make sure it's a unique id in the cluster
-    volumeAttributes:
-      source: "//samba.fileserver.svc.k8s.undercloud.local./music"
-    nodeStageSecretRef:
-      name: fileserver-smb-account
-      namespace: jellyfin
+  resources:
+    requests:
+      storage: 30Gi
+  volumeName: tvshows
+  storageClassName: smb
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
@@ -221,72 +209,6 @@ spec:
   volumeName: music-jelly
   storageClassName: ""
 ---
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: movies
-  namespace: jellyfin
-spec:
-  storageClassName: ""
-  capacity:
-    storage: 32Gi
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  mountOptions:
-    - dir_mode=0777
-    - file_mode=0777
-    - vers=3.0
-  csi:
-    driver: smb.csi.k8s.io
-    readOnly: false
-    volumeHandle: "movies"  # make sure it's a unique id in the cluster
-    volumeAttributes:
-      source: "//samba.fileserver.svc.k8s.undercloud.local./movies"
-    nodeStageSecretRef:
-      name: fileserver-smb-account
-      namespace: jellyfin
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: tvshows
-  namespace: jellyfin
-spec:
-  accessModes:
-    - ReadWriteMany
-  resources:
-    requests:
-      storage: 30Gi
-  volumeName: tvshows
-  storageClassName: ""
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: tvshows
-  namespace: jellyfin
-spec:
-  storageClassName: ""
-  capacity:
-    storage: 32Gi
-  accessModes:
-    - ReadWriteMany
-  persistentVolumeReclaimPolicy: Retain
-  mountOptions:
-    - dir_mode=0777
-    - file_mode=0777
-    - vers=3.0
-  csi:
-    driver: smb.csi.k8s.io
-    readOnly: false
-    volumeHandle: "tvshows"  # make sure it's a unique id in the cluster
-    volumeAttributes:
-      source: "//samba.fileserver.svc.k8s.undercloud.local./tvshows"
-    nodeStageSecretRef:
-      name: fileserver-smb-account
-      namespace: jellyfin
----
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata: