feat!: replace rancher/local-path-provisioner with democratic-csi in local-hostpath mode

Signed-off-by: Devin Buhl <devin@buhl.casa>

.github/renovate.json5

@@ -67,16 +67,6 @@
       },
       "separateMinorPatch": true
     },
-    {
-      "description": "Local Path Provisioner Group",
-      "groupName": "Local Path Provisioner",
-      "matchPackagePatterns": ["local-path-provisioner"],
-      "matchDatasources": ["docker", "github-tags"],
-      "group": {
-        "commitMessageTopic": "{{{groupName}}} group"
-      },
-      "separateMinorPatch": true
-    },
     {
       "description": "System Upgrade Controller Group",
       "groupName": "System Upgrade Controller",

README.md

@@ -502,7 +502,7 @@ To browse or get ideas on applications people are running, community member [@wh
 
 #### Storage
 
-The included CSI (`local-path-provisioner`) is a great start for storage but soon you might find you need more features like replicated block storage, or to connect to a NFS/SMB/iSCSI server. If you need any of those features be sure to check out the projects like [rook-ceph](https://github.com/rook/rook), [longhorn](https://github.com/longhorn/longhorn), [openebs](https://github.com/openebs/openebs), [democratic-csi](https://github.com/democratic-csi/democratic-csi), [csi-driver-nfs](https://github.com/kubernetes-csi/csi-driver-nfs),
+The included CSI (democratic-csi in local-hostpath mode) is a great start for storage but soon you might find you need more features like replicated block storage, or to connect to a NFS/SMB/iSCSI server. If you need any of those features be sure to check out the projects like [rook-ceph](https://github.com/rook/rook), [longhorn](https://github.com/longhorn/longhorn), [openebs](https://github.com/openebs/openebs), [democratic-csi](https://github.com/democratic-csi/democratic-csi), [csi-driver-nfs](https://github.com/kubernetes-csi/csi-driver-nfs),
 and [synology-csi](https://github.com/SynologyOpenSource/synology-csi).
 
 #### Authenticate Flux over SSH

bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2

@@ -168,6 +168,6 @@ spec:
             - *host
     persistence:
       enabled: true
-      storageClassName: local-path
+      storageClassName: local-hostpath
     testFramework:
       enabled: false

bootstrap/templates/addons/kube-prometheus-stack/app/helmvalues.yaml.j2

@@ -116,7 +116,7 @@ data:
         storageSpec:
           volumeClaimTemplate:
             spec:
-              storageClassName: local-path
+              storageClassName: local-hostpath
               resources:
                 requests:
                   storage: 10Gi

bootstrap/templates/ansible/inventory/group_vars/master/main.yaml.j2

@@ -17,7 +17,7 @@ k3s_server:
   disable:
     - coredns                         # Disable coredns                 - replaced with Coredns Helm Chart
     - flannel                         # Disable flannel                 - replaced with Cilium Helm Chart
-    - local-storage                   # Disable local-path-provisioner  - installed with Flux
+    - local-storage                   # Disable local-path-provisioner  - replaced with democratic-csi
     - metrics-server                  # Disable metrics-server          - installed with Flux
     - servicelb                       # Disable servicelb               - replaced with Cilium Helm Chart
     - traefik                         # Disable traefik                 - replaced with ingress-nginx and installed with Flux

bootstrap/templates/kubernetes/apps/kube-system/local-path-provisioner/app/helmrelease.yaml.j2

@@ -7,12 +7,12 @@ spec:
   interval: 30m
   chart:
     spec:
-      chart: ./deploy/chart/local-path-provisioner
+      chart: democratic-csi
+      version: 0.14.3
       sourceRef:
-        kind: GitRepository
-        name: local-path-provisioner
+        name: democratic-csi
+        kind: HelmRepository
         namespace: flux-system
-  maxHistory: 2
   install:
     remediation:
       retries: 3
@@ -23,51 +23,54 @@ spec:
   uninstall:
     keepHistory: false
   values:
-    image:
-      repository: docker.io/rancher/local-path-provisioner
-      tag: v0.0.26
-    helperImage:
-      repository: public.ecr.aws/docker/library/busybox
-      tag: latest
-    storageClass:
-      defaultClass: false
-    nodePathMap:
-      - node: DEFAULT_PATH_FOR_NON_LISTED_NODES
-        paths: ["{{ bootstrap_local_path_provisioner_path | default('/var/lib/rancher/k3s/storage', true) }}"]
-    # NOTE: Do not enable Flux variable substitution on this HelmRelease
-    configmap:
-      setup: |-
-        #!/bin/sh
-        while getopts "m:s:p:" opt
-        do
-            case $opt in
-                p)
-                absolutePath=$OPTARG
-                ;;
-                s)
-                sizeInBytes=$OPTARG
-                ;;
-                m)
-                volMode=$OPTARG
-                ;;
-            esac
-        done
-        mkdir -m 0777 -p ${absolutePath}
-        chmod 701 ${absolutePath}/..
-      teardown: |-
-        #!/bin/sh
-        while getopts "m:s:p:" opt
-        do
-            case $opt in
-                p)
-                absolutePath=$OPTARG
-                ;;
-                s)
-                sizeInBytes=$OPTARG
-                ;;
-                m)
-                volMode=$OPTARG
-                ;;
-            esac
-        done
-        rm -rf ${absolutePath}
+    fullnameOverride: local-path-provisioner
+    controller:
+      strategy: node
+      externalProvisioner:
+        image: registry.k8s.io/sig-storage/csi-provisioner:v3.6.3
+        extraArgs:
+          - --leader-election=false
+          - --node-deployment=true
+          - --node-deployment-immediate-binding=false
+          - --feature-gates=Topology=true
+          - --strict-topology=true
+          - --enable-capacity=true
+          - --capacity-ownerref-level=1
+      externalResizer:
+        enabled: false
+      externalAttacher:
+        enabled: false
+      externalSnapshotter:
+        enabled: false
+    csiDriver:
+      name: local-hostpath.cluster.local
+      storageCapacity: true
+      attachRequired: false
+      fsGroupPolicy: File
+    storageClasses:
+      - name: local-hostpath
+        defaultClass: false
+        reclaimPolicy: Delete
+        volumeBindingMode: WaitForFirstConsumer
+        allowVolumeExpansion: true
+    driver:
+      config:
+        driver: local-hostpath
+        local-hostpath:
+          shareBasePath: &storagePath "{{ bootstrap_local_path_provisioner_path | default('/var/lib/rancher/k3s/local-hostpath', true) }}"
+          controllerBasePath: *storagePath
+          dirPermissionsMode: "0770"
+          dirPermissionsUser: 0
+          dirPermissionsGroup: 0
+    node:
+      driver:
+        image: ghcr.io/democratic-csi/democratic-csi:v1.8.4
+        extraVolumeMounts:
+          - name: local-hostpath
+            mountPath: *storagePath
+            mountPropagation: Bidirectional
+      extraVolumes:
+        - name: local-hostpath
+          hostPath:
+            path: *storagePath
+            type: DirectoryOrCreate

bootstrap/templates/kubernetes/flux/repositories/git/kustomization.yaml.j2

@@ -1,5 +1,4 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-resources:
-  - ./local-path-provisioner.yaml
+resources: []

bootstrap/templates/kubernetes/flux/repositories/git/local-path-provisioner.yaml.j2

@@ -1,16 +0,0 @@
----
-apiVersion: source.toolkit.fluxcd.io/v1
-kind: GitRepository
-metadata:
-  name: local-path-provisioner
-  namespace: flux-system
-spec:
-  interval: 30m
-  url: https://github.com/rancher/local-path-provisioner
-  ref:
-    tag: v0.0.26
-  ignore: |
-    # exclude all
-    /*
-    # include kubernetes directory
-    !/deploy/chart/local-path-provisioner

bootstrap/templates/kubernetes/flux/repositories/helm/democratic-csi.yaml.j2

@@ -0,0 +1,10 @@
+---
+# yaml-language-server: $schema=https://kubernetes-schemas.pages.dev/source.toolkit.fluxcd.io/helmrepository_v1beta2.json
+apiVersion: source.toolkit.fluxcd.io/v1beta2
+kind: HelmRepository
+metadata:
+  name: democratic-csi
+  namespace: flux-system
+spec:
+  interval: 1h
+  url: https://democratic-csi.github.io/charts/

bootstrap/templates/kubernetes/flux/repositories/helm/kustomization.yaml.j2

@@ -8,6 +8,7 @@ resources:
   - ./cilium.yaml
   - ./coredns.yaml
   - ./csi-driver-nfs.yaml
+  - ./democratic-csi.yaml
   - ./external-dns.yaml
   - ./grafana.yaml
   - ./hajimari.yaml

bootstrap/templates/kubernetes/flux/repositories/kustomization.yaml.j2

@@ -4,4 +4,4 @@ kind: Kustomization
 resources:
   - ./git
   - ./helm
-  # - ./oci
+  - ./oci

bootstrap/templates/kubernetes/flux/repositories/oci/kustomization.yaml.j2

@@ -0,0 +1,4 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources: []

bootstrap/vars/config.sample.yaml

@@ -62,10 +62,8 @@ bootstrap_cluster_cidr: 10.42.0.0/16
 # (Advanced) For ipv6 use format 10.43.0.0/16,fd78:c889:47fb:e0::/112
 bootstrap_service_cidr: 10.43.0.0/16
 
-# (Advanced) Path for local-path-provisioner to use for storage on ALL nodes
-# If changing this value to anything other than the default
-# make sure the path exists and is owned by root:root with 701 permissions
-bootstrap_local_path_provisioner_path: /var/lib/rancher/k3s/storage
+# (Advanced) Path for democratic-csi local-hostpath to use for storage on ALL nodes
+bootstrap_local_path_provisioner_path: /var/lib/rancher/k3s/local-hostpath
 
 # Node information
 bootstrap_nodes: