feat: add nfs subdir provisioner, modify rook-bak nfs path

ryan-mcd · Dec 10, 2021 · 0a06050 · 0a06050
1 parent 974607d
commit 0a06050
Show file tree

Hide file tree

Showing 6 changed files with 60 additions and 1 deletion.
diff --git a/cluster/apps/kube-system/kustomization.yaml b/cluster/apps/kube-system/kustomization.yaml
@@ -6,4 +6,5 @@ resources:
   - node-feature-discovery
   - intel-gpu-plugin
   - reloader
+  - nfs-subdir-external-provisioner
   # - kured
diff --git a/cluster/apps/kube-system/nfs-subdir-provisioner/helm-release.yaml b/cluster/apps/kube-system/nfs-subdir-provisioner/helm-release.yaml
@@ -0,0 +1,43 @@
+---
+apiVersion: helm.toolkit.fluxcd.io/v2beta1
+kind: HelmRelease
+metadata:
+  name: nfs-subdir-external-provisioner
+  namespace: kube-system
+  labels:
+    kustomize.toolkit.fluxcd.io/substitute: "disabled"
+spec:
+  interval: 5m
+  chart:
+    spec:
+      # renovate: registryUrl=https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/
+      chart: nfs-subdir-external-provisioner
+      version: 4.0.14
+      sourceRef:
+        kind: HelmRepository
+        name: nfs-subdir-external-provisioner-charts
+        namespace: flux-system
+      interval: 5m
+  values:
+    replicaCount: 2
+    nfs:
+      server: "10.11.1.111"
+      path: "/mnt/user/PersistentVolumeClaims"
+      mountOptions:
+        - noatime
+    storageClass:
+      defaultClass: false
+      pathPattern: "${.PVC.namespace}-${.PVC.name}"
+      onDelete: retain
+    affinity:
+      podAntiAffinity:
+        preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 100
+            podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                  - key: app
+                    operator: In
+                    values:
+                      - nfs-subdir-external-provisioner
+              topologyKey: kubernetes.io/hostname
diff --git a/cluster/apps/kube-system/nfs-subdir-provisioner/kustomization.yaml b/cluster/apps/kube-system/nfs-subdir-provisioner/kustomization.yaml
@@ -0,0 +1,4 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+  - helm-release.yaml
diff --git a/cluster/apps/rook-ceph/rook-direct-mount/deployment.yaml b/cluster/apps/rook-ceph/rook-direct-mount/deployment.yaml
@@ -70,7 +70,7 @@ spec:
         - name: nas-data
           nfs:
             server: "${NAS_ADDR}"
-            path: /mnt/user/k8s-bak/rook-bak
+            path: /mnt/user/rook-bak/
         - name: direct-mount-scripts
           projected:
             defaultMode: 0775

diff --git a/cluster/base/flux-system/charts/helm/kustomization.yaml b/cluster/base/flux-system/charts/helm/kustomization.yaml
@@ -23,3 +23,4 @@ resources:
 - infracloudio-charts.yaml
 - rancher-server-charts.yaml
 - gitea-charts.yaml
+- nfs-subdir-external-provisioner-charts.yaml
diff --git a/cluster/base/flux-system/charts/helm/nfs-subdir-external-provisioner-charts.yaml b/cluster/base/flux-system/charts/helm/nfs-subdir-external-provisioner-charts.yaml
@@ -0,0 +1,10 @@
+---
+apiVersion: source.toolkit.fluxcd.io/v1beta1
+kind: HelmRepository
+metadata:
+  name: nfs-subdir-external-provisioner-charts
+  namespace: flux-system
+spec:
+  interval: 15m
+  url: https://kubernetes-sigs.github.io/nfs-subdir-external-provisioner/
+  timeout: 3m