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

Sync with Longhorn manager

Browse Source 
commit ad90204cc69512b1ed3c0b544d088fa22ebbb5ce
Author: Sheng Yang <sheng@yasker.org>
Date:   Thu Aug 23 14:12:21 2018 -0700

    Update image to rancher/longhorn-manager:v0.3.0

    Engine image: rancher/longhorn-engine:v0.3.0

    UI Image: rancher/longhorn-ui:v0.3.0
This commit is contained in:
Sheng Yang 2018-08-23 14:22:08 -07:00
parent 0953371646
commit d4d94cb82a
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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-rc5 image: rancher/longhorn-manager:v0.3.0
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-rc5 - rancher/longhorn-engine:v0.3.0
- --manager-image - --manager-image
- rancher/longhorn-manager:v0.3-rc5 - rancher/longhorn-manager:v0.3.0
- --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-rc5 image: rancher/longhorn-ui:v0.3.0
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-rc5 image: rancher/longhorn-manager:v0.3.0
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-rc5 image: rancher/longhorn-manager:v0.3.0
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-rc5 - rancher/longhorn-manager:v0.3.0
- --manager-url - --manager-url
- http://longhorn-backend:9500/v1 - http://longhorn-backend:9500/v1
# manually choose "flexvolume" or "csi" # manually choose "flexvolume" or "csi"

8
scripts/environment_check.sh
View File

@ -99,6 +99,7 @@ EOF
} }
cleanup() { cleanup() {
echo "cleaning up detection workloads..."
kubectl delete -f $TEMP_DIR/environment_check.yaml & kubectl delete -f $TEMP_DIR/environment_check.yaml &
a=$! a=$!
kubectl delete -f $TEMP_DIR/detect-flexvol-dir.yaml & kubectl delete -f $TEMP_DIR/detect-flexvol-dir.yaml &
@ -106,6 +107,7 @@ cleanup() {
wait $a wait $a
wait $b wait $b
rm -rf $TEMP_DIR rm -rf $TEMP_DIR
echo "clean up completed"
} }
wait_pod_ready() { wait_pod_ready() {
@ -125,7 +127,7 @@ wait_pod_ready() {
validate_pod() { validate_pod() {
flexvol_path=$(kubectl logs detect-flexvol-dir) flexvol_path=$(kubectl logs detect-flexvol-dir)
echo -e "\n FlexVolume Path: ${flexvol_path}\n" echo -e "\n FLEXVOLUME_DIR=\"${flexvol_path}\"\n"
} }
wait_ds_ready() { wait_ds_ready() {
@ -147,7 +149,7 @@ wait_ds_ready() {
validate_ds() { validate_ds() {
local allSupported=true local allSupported=true
local pods=$(kubectl -l app=longhorn-environment-check get po -o json) local pods=$(kubectl -l app=longhorn-environment-check get po -o json)
for ((i=0; i<1; i++)); do for ((i=0; i<1; i++)); do
local pod=$(echo $pods | jq .items[$i]) local pod=$(echo $pods | jq .items[$i])
local nodeName=$(echo $pod | jq -r .spec.nodeName) local nodeName=$(echo $pod | jq -r .spec.nodeName)
@ -162,7 +164,7 @@ validate_ds() {
if [ "$allSupported" != "true" ]; then if [ "$allSupported" != "true" ]; then
echo echo
echo " MountPropagation is disabled on at least one node." echo " MountPropagation is disabled on at least one node."
echo " As a result, CSI Driver and Base Image aren't supported." echo " As a result, CSI driver and Base image cannot be supported."
echo echo
exit 1 exit 1
else else