Sync with Longhorn Manager

commit 84a789aa73369ce7af52d0a6b0cd6e1e53683eaf Author: Sheng Yang <sheng@yasker.org> Date: Wed Nov 7 20:25:06 2018 -0800 Longhorn v0.3.2-rc1 release
longhorn · Nov 8, 2018 · dc338a2 · dc338a2
1 parent bd9bde1
commit dc338a2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml
@@ -21,7 +21,7 @@ rules:
   verbs:
   - "*"
 - apiGroups: [""]
-  resources: ["pods", "events", "persistentvolumes", "persistentvolumeclaims", "nodes", "proxy/nodes", "pods/log", "secrets", "services"]
+  resources: ["pods", "events", "persistentvolumes", "persistentvolumeclaims", "nodes", "proxy/nodes", "pods/log", "secrets", "services", "endpoints"]
   verbs: ["*"]
 - apiGroups: [""]
   resources: ["namespaces"]
@@ -178,7 +178,7 @@ spec:
     spec:
       containers:
       - name: longhorn-manager
-        image: rancher/longhorn-manager:v0.3.1
+        image: rancher/longhorn-manager:v0.3.2-rc1
         imagePullPolicy: Always
         securityContext:
           privileged: true
@@ -189,7 +189,7 @@ spec:
         - --engine-image
         - rancher/longhorn-engine:v0.3.0
         - --manager-image
-        - rancher/longhorn-manager:v0.3.1
+        - rancher/longhorn-manager:v0.3.2-rc1
         - --service-account
         - longhorn-service-account
         ports:
@@ -266,7 +266,7 @@ spec:
     spec:
       containers:
       - name: longhorn-ui
-        image: rancher/longhorn-ui:v0.3.1
+        image: rancher/longhorn-ui:v0.3.2-rc1
         ports:
         - containerPort: 8000
         env:
@@ -305,18 +305,18 @@ spec:
     spec:
       initContainers:
         - name: wait-longhorn-manager
-          image: rancher/longhorn-manager:v0.3.1
+          image: rancher/longhorn-manager:v0.3.2-rc1
           command: ['sh', '-c', 'while [ $(curl -m 1 -s -o /dev/null -w "%{http_code}" http://longhorn-backend:9500/v1) != "200" ]; do echo waiting; sleep 2; done']
       containers:
         - name: longhorn-driver-deployer
-          image: rancher/longhorn-manager:v0.3.1
+          image: rancher/longhorn-manager:v0.3.2-rc1
           imagePullPolicy: Always
           command:
           - longhorn-manager
           - -d
           - deploy-driver
           - --manager-image
-          - rancher/longhorn-manager:v0.3.1
+          - rancher/longhorn-manager:v0.3.2-rc1
           - --manager-url
           - http://longhorn-backend:9500/v1
           # manually choose "flexvolume" or "csi"

diff --git a/scripts/cleanup.sh b/scripts/cleanup.sh
@@ -32,13 +32,13 @@ remove_crd_instances() {
 
 # Delete driver related workloads in specific order
 remove_driver() {
+  kubectl -n ${NAMESPACE} delete deployment.apps/longhorn-driver-deployer
   kubectl -n ${NAMESPACE} delete daemonset.apps/longhorn-csi-plugin
   kubectl -n ${NAMESPACE} delete statefulset.apps/csi-attacher
   kubectl -n ${NAMESPACE} delete service/csi-attacher
   kubectl -n ${NAMESPACE} delete statefulset.apps/csi-provisioner
   kubectl -n ${NAMESPACE} delete service/csi-provisioner
   kubectl -n ${NAMESPACE} delete daemonset.apps/longhorn-flexvolume-driver
-  kubectl -n ${NAMESPACE} delete deployment.apps/longhorn-driver-deployer
 }
 
 # Delete all workloads in the namespace