chart: Remove flexvolume

Longhorn #358

Signed-off-by: Shuo Wu <shuo@rancher.com>

chart/README.md

@@ -8,15 +8,15 @@ The following document pertains to running Longhorn from the Rancher 2.0 chart.
 
 Longhorn is 100% open source software. Project source code is spread across a number of repos:
 
-1. Longhorn Engine -- Core controller/replica logic https://github.com/rancher/longhorn-engine
+1. Longhorn Engine -- Core controller/replica logic https://github.com/longhorn/longhorn-engine
-2. Longhorn Manager -- Longhorn orchestration, includes Flexvolume driver for Kubernetes https://github.com/rancher/longhorn-manager
+2. Longhorn Manager -- Longhorn orchestration, includes CSI driver for Kubernetes https://github.com/longhorn/longhorn-manager
-3. Longhorn UI -- Dashboard https://github.com/rancher/longhorn-ui
+3. Longhorn UI -- Dashboard https://github.com/longhorn/longhorn-ui
 
 ## Prerequisites
 
 1. Rancher v2.1+
 2. Docker v1.13+
-3. Kubernetes v1.8+ cluster with 1 or more nodes and Mount Propagation feature enabled. If your Kubernetes cluster was provisioned by Rancher v2.0.7+ or later, MountPropagation feature is enabled by default. [Check your Kubernetes environment now](https://github.com/rancher/longhorn#environment-check-script). If MountPropagation is disabled, the Kubernetes Flexvolume driver will be deployed instead of the default CSI driver. Base Image feature will also be disabled if MountPropagation is disabled.
+3. Kubernetes v1.14+
 4. Make sure `curl`, `findmnt`, `grep`, `awk` and `blkid` has been installed in all nodes of the Kubernetes cluster.
 5. Make sure `open-iscsi` has been installed in all nodes of the Kubernetes cluster. For GKE, recommended Ubuntu as guest OS image since it contains `open-iscsi` already.
 
@@ -37,23 +37,10 @@ Redeploy the (same version) Longhorn App. Follow the uninstallation procedure ab
 If your CRD instances or the CRDs themselves can't be deleted for whatever reason, run the commands below to clean up. Caution: this will wipe all Longhorn state!
 
 ```
-# Delete CRD finalizers, instances and definitions
+# Delete CRD instances and definitions
-for crd in $(kubectl get crd -o jsonpath={.items[*].metadata.name} | tr ' ' '\n' | grep longhorn.rancher.io); do
+curl -s https://raw.githubusercontent.com/longhorn/longhorn-manager/master/hack/cleancrs.sh |bash -s v062
-  kubectl -n ${NAMESPACE} get $crd -o yaml | sed "s/\- longhorn.rancher.io//g" | kubectl apply -f -
+curl -s https://raw.githubusercontent.com/longhorn/longhorn-manager/master/hack/cleancrs.sh |bash -s v070
-  kubectl -n ${NAMESPACE} delete $crd --all
-  kubectl delete crd/$crd
-done
 ```
 
-### Volume can be attached/detached from UI, but Kubernetes Pod/StatefulSet etc cannot use it
-
-Check if volume plugin directory has been set correctly. This is automatically detected unless user explicitly set it.
-
-By default, Kubernetes uses `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/`, as stated in the [official document](https://github.com/kubernetes/community/blob/master/contributors/devel/flexvolume.md#prerequisites).
-
-Some vendors choose to change the directory for various reasons. For example, GKE uses `/home/kubernetes/flexvolume` instead.
-
-User can find the correct directory by running `ps aux|grep kubelet` on the host and check the `--volume-plugin-dir` parameter. If there is none, the default `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/` will be used.
-
 ---
-Please see [link](https://github.com/rancher/longhorn) for more information.
+Please see [link](https://github.com/longhorn/longhorn) for more information.

chart/questions.yml

@@ -4,73 +4,62 @@ labels:
   io.rancher.certified: experimental
 namespace: longhorn-system
 questions:
-- variable: driver
-  default: csi
-  description: "Deploy either the CSI or FlexVolume driver. CSI is newer but requires MountPropagation, a feature enabled by default in Kubernetes v1.10 and later"
-  type: enum
-  options:
-  - csi
-  - flexvolume
-  label: Longhorn Kubernetes Driver
-  group: "Longhorn Driver Settings"
-  show_subquestion_if: flexvolume
-  subquestions:
-  - variable: persistence.flexvolumePath
-    default: ""
-    description: "Leave blank to autodetect. For RKE, use `/var/lib/kubelet/volumeplugins`. For GKE, use `/home/kubernetes/flexvolume/` instead. Users can find the correct directory by running `ps aux|grep kubelet` on the host and check the --volume-plugin-dir parameter.  If there is none, the default `/usr/libexec/kubernetes/kubelet-plugins/volume/exec/` will be used."
-    type: string
-    label: Longhorn Flexvolume Path
-  show_subquestion_if: csi
-  subquestions:
 - variable: csi.attacherImage
   default:
   description: "Specify CSI attacher image. Leave blank to autodetect."
   type: string
   label: Longhorn CSI Attacher Image
+  group: "Longhorn CSI Driver Settings"
 - variable: csi.provisionerImage
   default:
   description: "Specify CSI provisioner image. Leave blank to autodetect."
   type: string
   label: Longhorn CSI Provisioner Image
+  group: "Longhorn CSI Driver Settings"
 - variable: csi.driverRegistrarImage
   default:
   description: "Specify CSI Driver Registrar image. Leave blank to autodetect."
   type: string
   label: Longhorn CSI Driver Registrar Image
+  group: "Longhorn CSI Driver Settings"
 - variable: csi.kubeletRootDir
   default:
   description: "Specify kubelet root-dir. Leave blank to autodetect."
   type: string
   label: Kubelet Root Directory
+  group: "Longhorn CSI Driver Settings"
 - variable: csi.attacherReplicaCount
   type: int
   default:
   min: 1
   max: 10
-    description: "Specify number of CSI Attacher replica. By default 3."
+  description: "Specify replica count of CSI Attacher. By default 3."
   label: Longhorn CSI Attacher replica count
+  group: "Longhorn CSI Driver Settings"
 - variable: csi.provisionerReplicaCount
   type: int
   default:
   min: 1
   max: 10
-    description: "Specify number of CSI Provisioner replica. By default 3."
+  description: "Specify replica count of CSI Provisioner. By default 3."
   label: Longhorn CSI Provisioner replica count
+  group: "Longhorn CSI Driver Settings"
 - variable: persistence.defaultClass
   default: "true"
   description: "Set as default StorageClass"
-  group: "Longhorn Driver Settings"
+  group: "Longhorn CSI Driver Settings"
   type: boolean
   required: true
   label: Default Storage Class
 - variable: persistence.defaultClassReplicaCount
   description: "Set replica count for default StorageClass"
-  group: "Longhorn Driver Settings"
+  group: "Longhorn CSI Driver Settings"
   type: int
   default: 3
   min: 1
   max: 10
   label: Default Storage Class Replica Count
+
 - variable: defaultSettings.backupTarget
   label: Backup Target
   description: "The target used for backup. Support NFS or S3."

chart/templates/deployment-driver.yaml

@@ -29,8 +29,6 @@ spec:
           - "{{ .Values.image.longhorn.manager }}:{{ .Values.image.longhorn.managerTag }}"
           - --manager-url
           - http://longhorn-backend:9500/v1
-          - --driver
-          - "{{ .Values.driver }}"
           env:
           - name: POD_NAMESPACE
             valueFrom:
@@ -44,8 +42,6 @@ spec:
             valueFrom:
               fieldRef:
                 fieldPath: spec.serviceAccountName
-          - name: FLEXVOLUME_DIR
-            value: {{ .Values.persistence.flexvolumePath }}
           {{- if .Values.csi.kubeletRootDir }}
           - name: KUBELET_ROOT_DIR
             value: {{ .Values.csi.kubeletRootDir }}

chart/values.yaml

@@ -19,13 +19,7 @@ service:
     type: ClusterIP
     nodePort: ""
 
-# deploy either 'flexvolume' or 'csi' driver
-driver: csi
-
 persistence:
-  # for GKE uses /home/kubernetes/flexvolume/ instead, User can find the correct directory by running ps aux|grep kubelet on the host and check the --volume-plugin-dir parameter.
-  # If there is none, the default /usr/libexec/kubernetes/kubelet-plugins/volume/exec/ will be used.
-  flexvolumePath:
   defaultClass: true
   defaultClassReplicaCount: 3