diff --git a/k8s/charts/templates/app-nfs-storage.yaml b/k8s/charts/templates/app-nfs-storage.yaml index 21583e1..f0b738b 100644 --- a/k8s/charts/templates/app-nfs-storage.yaml +++ b/k8s/charts/templates/app-nfs-storage.yaml @@ -2,19 +2,25 @@ apiVersion: argoproj.io/v1alpha1 kind: Application metadata: - name: "csi-driver-nfs" + name: "nfs-generic" namespace: "{{ .Release.Namespace }}" spec: project: meta-infrastructure source: - chart: csi-driver-nfs - repoURL: "https://raw.githubusercontent.com/kubernetes-csi/csi-driver-nfs/master/charts" + chart: nfs-subdir-external-provisioner + repoURL: "https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/" targetRevision: "v4.2.0" helm: - releaseName: csi-driver-nfs + releaseName: nfs-subdir-external-provisioner + values: |- + nfs: + server: {{ .Values.nfs.server }} + path: {{ .Values.nfs.share }} + storageClass: + name: "nfs-generic" destination: server: https://kubernetes.default.svc - namespace: "csi-driver-nfs" + namespace: "nfs-subdir-external-provisioner" syncPolicy: automated: selfHeal: true diff --git a/k8s/charts/values-prod.yaml b/k8s/charts/values-prod.yaml index e69de29..3943d55 100644 --- a/k8s/charts/values-prod.yaml +++ b/k8s/charts/values-prod.yaml @@ -0,0 +1,3 @@ +nfs: + server: "192.168.8.107" + share: "/mnt/EightTerra/k3s-cluster" diff --git a/k8s/charts/values.yaml b/k8s/charts/values.yaml index e69de29..44074c5 100644 --- a/k8s/charts/values.yaml +++ b/k8s/charts/values.yaml @@ -0,0 +1,3 @@ +nfs: + server: "changeme" + share: "/" diff --git a/k8s/infra/storage/templates/nfs-stroage-class.yaml b/k8s/infra/storage/templates/nfs-stroage-class.yaml index fcb171a..1025c22 100644 --- a/k8s/infra/storage/templates/nfs-stroage-class.yaml +++ b/k8s/infra/storage/templates/nfs-stroage-class.yaml @@ -11,17 +11,3 @@ reclaimPolicy: Retain volumeBindingMode: Immediate mountOptions: - nfsvers=4.1 - ---- -apiVersion: storage.k8s.io/v1 -kind: StorageClass -metadata: - name: truenas-scale-nfs-k3s-cluster-general -provisioner: nfs.csi.k8s.io -parameters: - server: "192.168.8.107" - share: /mnt/EightTerra/k3s-cluster -reclaimPolicy: Retain -volumeBindingMode: Immediate -mountOptions: - - nfsvers=4.1