ivampiresp/longhorn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with Longhorn manager

Browse Source 
commit 7a292a02efd8844969202fa19d92802b19e16343
Author: Sheng Yang <sheng@yasker.org>
Date:   Wed Sep 12 10:52:59 2018 -0700

    deploy: update driver yaml for Flexvolume directory auto detection
This commit is contained in:
Sheng Yang 2018-09-12 17:42:10 -07:00
parent 64ae665ba8
commit a711494368
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deploy/longhorn.yaml
View File

@ -178,7 +178,7 @@ spec:
spec: spec:
containers: containers:
- name: longhorn-manager - name: longhorn-manager
image: rancher/longhorn-manager:v0.3.0 image: rancher/longhorn-manager:v0.3.1-rc1
imagePullPolicy: Always imagePullPolicy: Always
securityContext: securityContext:
privileged: true privileged: true
@ -187,9 +187,9 @@ spec:
- -d - -d
- daemon - daemon
- --engine-image - --engine-image
- rancher/longhorn-engine:v0.3.0 - rancher/longhorn-engine:v0.3.1-rc1
- --manager-image - --manager-image
- rancher/longhorn-manager:v0.3.0 - rancher/longhorn-manager:v0.3.1-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.0 image: rancher/longhorn-ui:v0.3.1-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.0 image: rancher/longhorn-manager:v0.3.1-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.0 image: rancher/longhorn-manager:v0.3.1-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.0 - rancher/longhorn-manager:v0.3.1-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"
@ -335,13 +335,11 @@ spec:
valueFrom: valueFrom:
fieldRef: fieldRef:
fieldPath: spec.serviceAccountName fieldPath: spec.serviceAccountName
- name: FLEXVOLUME_DIR # For auto detection, leave this parameter unset
value: "/var/lib/kubelet/volumeplugins" #- name: FLEXVOLUME_DIR
# FOR RKE # FOR RKE
#value: "/var/lib/kubelet/volumeplugins" #value: "/var/lib/kubelet/volumeplugins"
# FOR GKE # FOR GKE
#value: "/home/kubernetes/flexvolume/" #value: "/home/kubernetes/flexvolume/"
# For default or auto detection with Kubernetes <= v1.8
#value: ""
serviceAccountName: longhorn-service-account serviceAccountName: longhorn-service-account
--- ---

3
scripts/cleanup.sh
View File

@ -7,14 +7,13 @@ remove_and_wait() {
out=`kubectl -n ${NAMESPACE} delete $crd --all 2>&1` out=`kubectl -n ${NAMESPACE} delete $crd --all 2>&1`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo $out echo $out
break return
fi fi
while true; do while true; do
out=`kubectl -n ${NAMESPACE} get $crd -o yaml | grep 'items: \[\]'` out=`kubectl -n ${NAMESPACE} get $crd -o yaml | grep 'items: \[\]'`
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
break break
fi fi
echo $out
sleep 1 sleep 1
done done
echo all $crd instances deleted echo all $crd instances deleted