github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #44179 from mikedanese/saltsucks

Browse Source 
Automatic merge from submit-queue

make salt return non-zero exit code on failure

Fixes https://github.com/kubernetes/kubernetes/issues/32478
This commit is contained in:
Kubernetes Submit Queue 2017-04-06 16:08:49 -07:00 committed by GitHub
commit af341e3fd1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/gce/configure-vm.sh
View File

@ -796,7 +796,7 @@ function run-salt() {
echo "== Calling Salt ==" echo "== Calling Salt =="
local rc=0 local rc=0
for i in {0..6}; do for i in {0..6}; do
salt-call --local state.highstate && rc=0 || rc=$? salt-call --retcode-passthrough --local state.highstate && rc=0 || rc=$?
if [[ "${rc}" == 0 ]]; then if [[ "${rc}" == 0 ]]; then
return 0 return 0
fi fi