chart: Update deployment files

Longhorn #1163

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

chart/README.md

@@ -9,8 +9,9 @@ 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/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
+2. Longhorn Instance Manager -- Controller/replica instance lifecycle management https://github.com/longhorn/longhorn-instance-manager
+3. Longhorn Manager -- Longhorn orchestration, includes CSI driver for Kubernetes https://github.com/longhorn/longhorn-manager
+4. Longhorn UI -- Dashboard https://github.com/longhorn/longhorn-ui
 
 ## Prerequisites
 

chart/questions.yml

@@ -1,7 +1,5 @@
 categories:
 - storage
-labels:
-  io.rancher.certified: experimental
 namespace: longhorn-system
 questions:
 - variable: image.defaultImage

chart/templates/clusterrole.yaml

@@ -10,7 +10,7 @@ rules:
   verbs:
   - "*"
 - apiGroups: [""]
-  resources: ["pods", "events", "persistentvolumes", "persistentvolumeclaims", "nodes", "proxy/nodes", "pods/log", "secrets", "services", "endpoints", "configmaps"]
+  resources: ["pods", "events", "persistentvolumes", "persistentvolumeclaims","persistentvolumeclaims/status", "nodes", "proxy/nodes", "pods/log", "secrets", "services", "endpoints", "configmaps"]
   verbs: ["*"]
 - apiGroups: [""]
   resources: ["namespaces"]
@@ -34,7 +34,3 @@ rules:
 - 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: ["*"]

chart/templates/crds.yaml

@@ -135,129 +135,3 @@ spec:
   version: v1beta1
   subresources:
     status: {}
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  labels:
-    longhorn-manager: Engine
-  name: engines.longhorn.rancher.io
-spec:
-  group: longhorn.rancher.io
-  names:
-    kind: Engine
-    listKind: EngineList
-    plural: engines
-    shortNames:
-    - lhe
-    singular: engine
-  scope: Namespaced
-  version: v1alpha1
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  labels:
-    longhorn-manager: Replica
-  name: replicas.longhorn.rancher.io
-spec:
-  group: longhorn.rancher.io
-  names:
-    kind: Replica
-    listKind: ReplicaList
-    plural: replicas
-    shortNames:
-    - lhr
-    singular: replica
-  scope: Namespaced
-  version: v1alpha1
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  labels:
-    longhorn-manager: Setting
-  name: settings.longhorn.rancher.io
-spec:
-  group: longhorn.rancher.io
-  names:
-    kind: Setting
-    listKind: SettingList
-    plural: settings
-    shortNames:
-    - lhs
-    singular: setting
-  scope: Namespaced
-  version: v1alpha1
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  labels:
-    longhorn-manager: Volume
-  name: volumes.longhorn.rancher.io
-spec:
-  group: longhorn.rancher.io
-  names:
-    kind: Volume
-    listKind: VolumeList
-    plural: volumes
-    shortNames:
-    - lhv
-    singular: volume
-  scope: Namespaced
-  version: v1alpha1
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  labels:
-    longhorn-manager: EngineImage
-  name: engineimages.longhorn.rancher.io
-spec:
-  group: longhorn.rancher.io
-  names:
-    kind: EngineImage
-    listKind: EngineImageList
-    plural: engineimages
-    shortNames:
-    - lhei
-    singular: engineimage
-  scope: Namespaced
-  version: v1alpha1
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  labels:
-    longhorn-manager: Node
-  name: nodes.longhorn.rancher.io
-spec:
-  group: longhorn.rancher.io
-  names:
-    kind: Node
-    listKind: NodeList
-    plural: nodes
-    shortNames:
-    - lhn
-    singular: node
-  scope: Namespaced
-  version: v1alpha1
----
-apiVersion: apiextensions.k8s.io/v1beta1
-kind: CustomResourceDefinition
-metadata:
-  labels:
-    longhorn-manager: InstanceManager
-  name: instancemanagers.longhorn.rancher.io
-spec:
-  group: longhorn.rancher.io
-  names:
-    kind: InstanceManager
-    listKind: InstanceManagerList
-    plural: instancemanagers
-    shortNames:
-    - lhim
-    singular: instancemanager
-  scope: Namespaced
-  version: v1alpha1

chart/templates/daemonset-sa.yaml

@@ -35,6 +35,9 @@ spec:
         ports:
         - containerPort: 9500
           name: manager
+        readinessProbe:
+          tcpSocket:
+            port: 9500
         volumeMounts:
         - name: dev
           mountPath: /host/dev/
@@ -60,8 +63,6 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
-        - name: LONGHORN_BACKEND_SVC
-          value: longhorn-backend
         - name: DEFAULT_SETTING_PATH
           value: /var/lib/longhorn-setting/default-setting.yaml
       volumes:

chart/templates/default-setting.yaml

@@ -18,4 +18,4 @@ data:
     default-longhorn-static-storage-class: {{ .Values.defaultSettings.defaultLonghornStaticStorageClass }}
     backupstore-poll-interval: {{ .Values.defaultSettings.backupstorePollInterval }}
     taint-toleration: {{ .Values.defaultSettings.taintToleration }}
-    registry-secret:  {{ .Values.defaultSettings.registrySecret }}
+    registry-secret: {{ .Values.defaultSettings.registrySecret }}

chart/templates/deployment-driver.yaml

@@ -54,9 +54,9 @@ spec:
           - name: CSI_PROVISIONER_IMAGE
             value: {{ .Values.csi.provisionerImage }}
           {{- end }}
-          {{- if .Values.csi.driverRegistrarImage }}
-          - name: CSI_DRIVER_REGISTRAR_IMAGE
-            value: {{ .Values.csi.driverRegistrarImage }}
+          {{- if .Values.csi.nodeDriverRegistrarImage }}
+          - name: CSI_NODE_DRIVER_REGISTRAR_IMAGE
+            value: {{ .Values.csi.nodeDriverRegistrarImage }}
           {{- end }}
           {{- if .Values.csi.resizerImage }}
           - name: CSI_RESIZER_IMAGE

chart/templates/deployment-ui.yaml

@@ -18,6 +18,7 @@ spec:
       containers:
       - name: longhorn-ui
         image: "{{ .Values.image.longhorn.ui }}:{{ .Values.image.longhorn.uiTag }}"
+        imagePullPolicy: Always
         ports:
         - containerPort: 8000
           name: http

chart/templates/storageclass.yaml

@@ -10,6 +10,7 @@ metadata:
     storageclass.beta.kubernetes.io/is-default-class: "false"
   {{- end }}
 provisioner: driver.longhorn.io
+allowVolumeExpansion: true
 parameters:
   numberOfReplicas: "{{ .Values.persistence.defaultClassReplicaCount }}"
   staleReplicaTimeout: "30"

chart/values.yaml

@@ -28,7 +28,7 @@ persistence:
 csi:
   attacherImage:
   provisionerImage:
-  driverRegistrarImage:
+  nodeDriverRegistrarImage:
   resizerImage:
   kubeletRootDir:
   attacherReplicaCount:
@@ -51,9 +51,9 @@ defaultSettings:
   registrySecret:
 
 privateRegistry:
-    registryUrl:
-    registryUser:
-    registryPasswd:
+  registryUrl:
+  registryUser:
+  registryPasswd:
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious