1
0
mirror of https://github.com/rancher/rke.git synced 2025-04-27 19:25:44 +00:00

Merge pull request #2588 from superseb/update_kdm_20212506_2

go generate
This commit is contained in:
Sebastiaan van Steenis 2021-06-25 21:10:58 +02:00 committed by GitHub
commit 765b32600e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 21 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -97,8 +97,8 @@ done
# Wait for rke to finish # Wait for rke to finish
for pid in $pids; do for pid in $pids; do
wait $pid wait $pid
echo_with_time "PID ${pid} for ${pids_to_version["${pid}"]} is done"
pid_results["${pid}"]="$?" pid_results["${pid}"]="$?"
echo_with_time "PID ${pid} for ${pids_to_version["${pid}"]} is done"
done done
# Stop tailing the logs # Stop tailing the logs
@ -203,8 +203,8 @@ done
# Wait for rke to finish # Wait for rke to finish
for pid_upgrade in $pids_upgrade; do for pid_upgrade in $pids_upgrade; do
wait $pid_upgrade wait $pid_upgrade
echo_with_time "PID ${pid_upgrade} for upgrade of ${pids_upgrade_to_version["${pid_upgrade}"]} to "${version_to_upgraded_version["${pids_upgrade_to_version["${pid_upgrade}"]}"]}" is done"
pid_upgrade_results["${pid_upgrade}"]="$?" pid_upgrade_results["${pid_upgrade}"]="$?"
echo_with_time "PID ${pid_upgrade} for upgrade of ${pids_upgrade_to_version["${pid_upgrade}"]} to "${version_to_upgraded_version["${pids_upgrade_to_version["${pid_upgrade}"]}"]}" is done"
done done
# Stop tailing the logs # Stop tailing the logs