From dc338a28f3648ebcf2f93a271789949ffc03b566 Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Wed, 7 Nov 2018 21:49:49 -0800 Subject: [PATCH 1/3] Sync with Longhorn Manager commit 84a789aa73369ce7af52d0a6b0cd6e1e53683eaf Author: Sheng Yang Date: Wed Nov 7 20:25:06 2018 -0800 Longhorn v0.3.2-rc1 release --- deploy/longhorn.yaml | 14 +++++++------- scripts/cleanup.sh | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml index 69208cb..601c8f0 100644 --- 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 index 63d3085..2b9b5f9 100755 --- 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 From f4c6df2b71000db1307a37620cc13ecde1e2fb2c Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Thu, 8 Nov 2018 17:18:29 -0800 Subject: [PATCH 2/3] Sync with Longhorn Manager commit f8e118bceef9a216429d3ba5e6c85413a3adefd2 Author: Sheng Yang Date: Thu Nov 8 17:14:49 2018 -0800 Longhorn v0.3.2-rc2 release --- deploy/longhorn.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml index 601c8f0..0fdedd5 100644 --- a/deploy/longhorn.yaml +++ b/deploy/longhorn.yaml @@ -178,7 +178,7 @@ spec: spec: containers: - name: longhorn-manager - image: rancher/longhorn-manager:v0.3.2-rc1 + image: rancher/longhorn-manager:v0.3.2-rc2 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.2-rc1 + - rancher/longhorn-manager:v0.3.2-rc2 - --service-account - longhorn-service-account ports: @@ -266,7 +266,7 @@ spec: spec: containers: - name: longhorn-ui - image: rancher/longhorn-ui:v0.3.2-rc1 + image: rancher/longhorn-ui:v0.3.2-rc2 ports: - containerPort: 8000 env: @@ -305,18 +305,18 @@ spec: spec: initContainers: - name: wait-longhorn-manager - image: rancher/longhorn-manager:v0.3.2-rc1 + image: rancher/longhorn-manager:v0.3.2-rc2 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.2-rc1 + image: rancher/longhorn-manager:v0.3.2-rc2 imagePullPolicy: Always command: - longhorn-manager - -d - deploy-driver - --manager-image - - rancher/longhorn-manager:v0.3.2-rc1 + - rancher/longhorn-manager:v0.3.2-rc2 - --manager-url - http://longhorn-backend:9500/v1 # manually choose "flexvolume" or "csi" From 4993367a06f20b4160631108cb142a63667484aa Mon Sep 17 00:00:00 2001 From: Sheng Yang Date: Fri, 9 Nov 2018 14:08:00 -0800 Subject: [PATCH 3/3] Sync with Longhorn Manager commit 2269a35e6246363b8b51e10cefea4126cbb73ea6 Author: Sheng Yang Date: Fri Nov 9 13:48:32 2018 -0800 Longhorn v0.3.2 release --- deploy/longhorn.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/deploy/longhorn.yaml b/deploy/longhorn.yaml index 0fdedd5..05022f2 100644 --- a/deploy/longhorn.yaml +++ b/deploy/longhorn.yaml @@ -178,7 +178,7 @@ spec: spec: containers: - name: longhorn-manager - image: rancher/longhorn-manager:v0.3.2-rc2 + image: rancher/longhorn-manager:v0.3.2 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.2-rc2 + - rancher/longhorn-manager:v0.3.2 - --service-account - longhorn-service-account ports: @@ -266,7 +266,7 @@ spec: spec: containers: - name: longhorn-ui - image: rancher/longhorn-ui:v0.3.2-rc2 + image: rancher/longhorn-ui:v0.3.2 ports: - containerPort: 8000 env: @@ -305,18 +305,18 @@ spec: spec: initContainers: - name: wait-longhorn-manager - image: rancher/longhorn-manager:v0.3.2-rc2 + image: rancher/longhorn-manager:v0.3.2 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.2-rc2 + image: rancher/longhorn-manager:v0.3.2 imagePullPolicy: Always command: - longhorn-manager - -d - deploy-driver - --manager-image - - rancher/longhorn-manager:v0.3.2-rc2 + - rancher/longhorn-manager:v0.3.2 - --manager-url - http://longhorn-backend:9500/v1 # manually choose "flexvolume" or "csi"