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
This commit is contained in:
Sheng Yang 2018-11-07 21:49:49 -08:00
parent bd9bde1e8c
commit dc338a28f3
2 changed files with 8 additions and 8 deletions

View File

@ -21,7 +21,7 @@ rules:
verbs: verbs:
- "*" - "*"
- apiGroups: [""] - 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: ["*"] verbs: ["*"]
- apiGroups: [""] - apiGroups: [""]
resources: ["namespaces"] resources: ["namespaces"]
@ -178,7 +178,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-manager - name: longhorn-manager
image: rancher/longhorn-manager:v0.3.1 image: rancher/longhorn-manager:v0.3.2-rc1
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
@ -189,7 +189,7 @@ spec:
- --engine-image - --engine-image
- rancher/longhorn-engine:v0.3.0 - rancher/longhorn-engine:v0.3.0
- --manager-image - --manager-image
- rancher/longhorn-manager:v0.3.1 - rancher/longhorn-manager:v0.3.2-rc1
- --service-account - --service-account
- longhorn-service-account - longhorn-service-account
ports: ports:
@ -266,7 +266,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-ui - name: longhorn-ui
image: rancher/longhorn-ui:v0.3.1 image: rancher/longhorn-ui:v0.3.2-rc1
ports: ports:
- containerPort: 8000 - containerPort: 8000
env: env:
@ -305,18 +305,18 @@ spec:
spec: spec:
initContainers: initContainers:
- name: wait-longhorn-manager - 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'] 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: containers:
- name: longhorn-driver-deployer - name: longhorn-driver-deployer
image: rancher/longhorn-manager:v0.3.1 image: rancher/longhorn-manager:v0.3.2-rc1
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- longhorn-manager - longhorn-manager
- -d - -d
- deploy-driver - deploy-driver
- --manager-image - --manager-image
- rancher/longhorn-manager:v0.3.1 - rancher/longhorn-manager:v0.3.2-rc1
- --manager-url - --manager-url
- http://longhorn-backend:9500/v1 - http://longhorn-backend:9500/v1
# manually choose "flexvolume" or "csi" # manually choose "flexvolume" or "csi"

View File

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