Merge pull request longhorn#886 from longhorn/v0.7.0

V0.7.0
pengshao1942 · Nov 15, 2019 · ebeaff7 · ebeaff7
2 parents ee80f60 + 6769843
commit ebeaff7
Show file tree

Hide file tree

Showing 26 changed files with 594 additions and 277 deletions.
diff --git a/README.md b/README.md
@@ -23,9 +23,9 @@ You can read more technical details of Longhorn [here](http://rancher.com/micros
 
 ## Current status
 
-Longhorn is alpha-quality software. We appreciate your willingness to deploy Longhorn and provide feedback.
+Longhorn is beta-quality software. We appreciate your willingness to deploy Longhorn and provide feedback.
 
-The latest release of Longhorn is **v0.6.2**.
+The latest release of Longhorn is **v0.7.0**.
 
 ## Source code
 Longhorn is 100% open source software. Project source code is spread across a number of repos:
@@ -34,7 +34,7 @@ Longhorn is 100% open source software. Project source code is spread across a nu
 1. Longhorn manager -- Longhorn orchestration, includes Flexvolume driver for Kubernetes https://github.com/longhorn/longhorn-manager
 1. Longhorn UI -- Dashboard https://github.com/longhorn/longhorn-ui
 
-![Longhorn UI](https://s3-us-west-1.amazonaws.com/rancher-longhorn/Longhorn_UI.png)
+![Longhorn UI](./longhorn-ui.png)
 
 # Requirements
 
@@ -222,6 +222,7 @@ More examples are available at `./examples/`
 ### [Use CSI driver on RancherOS/CoreOS + RKE or K3S](./docs/csi-config.md)
 ### [Restore a backup to an image file](./docs/restore-to-file.md)
 ### [Disaster Recovery Volume](./docs/dr-volume.md)
+### [Recover volume after unexpected detachment](./docs/recover-volume.md)
 
 # Troubleshooting
 You can click `Generate Support Bundle` link at the bottom of the UI to download a zip file contains Longhorn related configuration and logs.

diff --git a/chart/Chart.yaml b/chart/Chart.yaml
@@ -1,8 +1,8 @@
 apiVersion: v1
 name: longhorn
-version: 0.6.2
-appVersion: v0.6.2
-kubeVersion: ">=v1.12.0-r0"
+version: 0.7.0
+appVersion: v0.7.0
+kubeVersion: ">=v1.14.0-r0"
 description: Longhorn is a distributed block storage system for Kubernetes powered by Rancher Labs.
 keywords:
 - longhorn
@@ -21,4 +21,4 @@ sources:
 maintainers:
 - name: rancher
   email: charts@rancher.com
-icon: https://s3.us-east-2.amazonaws.com/longhorn-assets/longhorn-logo.svg
+icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/longhorn/horizontal/color/longhorn-horizontal-color.svg?sanitize=true
diff --git a/chart/README.md b/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
-2. Longhorn Manager -- Longhorn orchestration, includes Flexvolume driver for Kubernetes https://github.com/rancher/longhorn-manager
-3. Longhorn UI -- Dashboard https://github.com/rancher/longhorn-ui
+1. Longhorn Engine -- Core controller/replica logic https://github.com/longhorn/longhorn-engine
+2. Longhorn Manager -- Longhorn orchestration, includes CSI driver for Kubernetes https://github.com/longhorn/longhorn-manager
+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
-for crd in $(kubectl get crd -o jsonpath={.items[*].metadata.name} | tr ' ' '\n' | grep longhorn.rancher.io); do
-  kubectl -n ${NAMESPACE} get $crd -o yaml | sed "s/\- longhorn.rancher.io//g" | kubectl apply -f -
-  kubectl -n ${NAMESPACE} delete $crd --all
-  kubectl delete crd/$crd
-done
+# Delete CRD instances and definitions
+curl -s https://raw.githubusercontent.com/longhorn/longhorn-manager/master/hack/cleancrds.sh |bash -s v062
+curl -s https://raw.githubusercontent.com/longhorn/longhorn-manager/master/hack/cleancrds.sh |bash -s v070
 ```
 
-### 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.
diff --git a/chart/questions.yml b/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
-  - variable: csi.provisionerImage
-    default:
-    description: "Specify CSI provisioner image. Leave blank to autodetect."
-    type: string
-    label: Longhorn CSI Provisioner Image
-  - variable: csi.driverRegistrarImage
-    default:
-    description: "Specify CSI Driver Registrar image. Leave blank to autodetect."
-    type: string
-    label: Longhorn CSI Driver Registrar Image
-  - variable: csi.kubeletRootDir
-    default:
-    description: "Specify kubelet root-dir. Leave blank to autodetect."
-    type: string
-    label: Kubelet Root Directory
-  - variable: csi.attacherReplicaCount
-    type: int
-    default:
-    min: 1
-    max: 10
-    description: "Specify number of CSI Attacher replica. By default 3."
-    label: Longhorn CSI Attacher replica count
-  - variable: csi.provisionerReplicaCount
-    type: int
-    default:
-    min: 1
-    max: 10
-    description: "Specify number of CSI Provisioner replica. By default 3."
-    label: Longhorn CSI Provisioner replica count
+- 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 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 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."

diff --git a/chart/templates/clusterrole.yaml b/chart/templates/clusterrole.yaml
@@ -22,11 +22,19 @@ rules:
   resources: ["jobs", "cronjobs"]
   verbs: ["*"]
 - apiGroups: ["storage.k8s.io"]
-  resources: ["storageclasses", "volumeattachments"]
+  resources: ["storageclasses", "volumeattachments", "csinodes", "csidrivers"]
   verbs: ["*"]
-- apiGroups: ["csi.storage.k8s.io"]
-  resources: ["csinodeinfos"]
-  verbs: ["get", "list", "watch"]
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["get", "watch", "list", "delete", "update", "create"]
+- apiGroups: ["longhorn.io"]
+  resources: ["volumes", "volumes/status", "engines", "engines/status", "replicas", "replicas/status", "settings",
+              "engineimages", "engineimages/status", "nodes", "nodes/status", "instancemanagers", "instancemanagers/status"]
+  verbs: ["*"]
+- apiGroups: ["coordination.k8s.io"]
+  resources: ["leases"]
+  verbs: ["*"]
+# to be removed after v0.7.0
 - apiGroups: ["longhorn.rancher.io"]
   resources: ["volumes", "engines", "replicas", "settings", "engineimages", "nodes", "instancemanagers"]
   verbs: ["*"]
diff --git a/chart/templates/crds.yaml b/chart/templates/crds.yaml
@@ -1,5 +1,143 @@
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
+metadata:
+  labels:
+    longhorn-manager: Engine
+  name: engines.longhorn.io
+spec:
+  group: longhorn.io
+  names:
+    kind: Engine
+    listKind: EngineList
+    plural: engines
+    shortNames:
+    - lhe
+    singular: engine
+  scope: Namespaced
+  version: v1beta1
+  subresources:
+    status: {}
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    longhorn-manager: Replica
+  name: replicas.longhorn.io
+spec:
+  group: longhorn.io
+  names:
+    kind: Replica
+    listKind: ReplicaList
+    plural: replicas
+    shortNames:
+    - lhr
+    singular: replica
+  scope: Namespaced
+  version: v1beta1
+  subresources:
+    status: {}
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    longhorn-manager: Setting
+  name: settings.longhorn.io
+spec:
+  group: longhorn.io
+  names:
+    kind: Setting
+    listKind: SettingList
+    plural: settings
+    shortNames:
+    - lhs
+    singular: setting
+  scope: Namespaced
+  version: v1beta1
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    longhorn-manager: Volume
+  name: volumes.longhorn.io
+spec:
+  group: longhorn.io
+  names:
+    kind: Volume
+    listKind: VolumeList
+    plural: volumes
+    shortNames:
+    - lhv
+    singular: volume
+  scope: Namespaced
+  version: v1beta1
+  subresources:
+    status: {}
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    longhorn-manager: EngineImage
+  name: engineimages.longhorn.io
+spec:
+  group: longhorn.io
+  names:
+    kind: EngineImage
+    listKind: EngineImageList
+    plural: engineimages
+    shortNames:
+    - lhei
+    singular: engineimage
+  scope: Namespaced
+  version: v1beta1
+  subresources:
+    status: {}
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    longhorn-manager: Node
+  name: nodes.longhorn.io
+spec:
+  group: longhorn.io
+  names:
+    kind: Node
+    listKind: NodeList
+    plural: nodes
+    shortNames:
+    - lhn
+    singular: node
+  scope: Namespaced
+  version: v1beta1
+  subresources:
+    status: {}
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  labels:
+    longhorn-manager: InstanceManager
+  name: instancemanagers.longhorn.io
+spec:
+  group: longhorn.io
+  names:
+    kind: InstanceManager
+    listKind: InstanceManagerList
+    plural: instancemanagers
+    shortNames:
+    - lhim
+    singular: instancemanager
+  scope: Namespaced
+  version: v1beta1
+  subresources:
+    status: {}
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
 metadata:
   labels:
     longhorn-manager: Engine
@@ -122,4 +260,4 @@ spec:
     - lhim
     singular: instancemanager
   scope: Namespaced
-  version: v1alpha1
+  version: v1alpha1