Merge "[k8s] Use helm upgrade --install in deployment loop" into stable/ussuri
This commit is contained in:
commit
b0d49e2a4e
|
@ -48,7 +48,7 @@ else
|
||||||
$ssh_cmd tar xzvf /srv/magnum/helm-client.tar.gz linux-amd64/helm -O > /srv/magnum/bin/helm
|
$ssh_cmd tar xzvf /srv/magnum/helm-client.tar.gz linux-amd64/helm -O > /srv/magnum/bin/helm
|
||||||
$ssh_cmd chmod +x /srv/magnum/bin/helm
|
$ssh_cmd chmod +x /srv/magnum/bin/helm
|
||||||
|
|
||||||
helm_install_cmd="helm install magnum . --namespace kube-system --values values.yaml --render-subchart-notes"
|
helm_install_cmd="helm upgrade --install magnum . --namespace kube-system --values values.yaml --render-subchart-notes"
|
||||||
helm_history_cmd="helm history magnum --namespace kube-system"
|
helm_history_cmd="helm history magnum --namespace kube-system"
|
||||||
if [[ "${HELM_CLIENT_TAG}" == v2.* ]]; then
|
if [[ "${HELM_CLIENT_TAG}" == v2.* ]]; then
|
||||||
CERTS_DIR="/etc/kubernetes/helm/certs"
|
CERTS_DIR="/etc/kubernetes/helm/certs"
|
||||||
|
@ -64,7 +64,7 @@ else
|
||||||
until helm init --client-only --wait; do
|
until helm init --client-only --wait; do
|
||||||
sleep 5s
|
sleep 5s
|
||||||
done
|
done
|
||||||
helm_install_cmd="helm install --name magnum . --namespace kube-system --values values.yaml --render-subchart-notes"
|
helm_install_cmd="helm upgrade --install --name magnum . --namespace kube-system --values values.yaml --render-subchart-notes"
|
||||||
helm_history_cmd="helm history magnum"
|
helm_history_cmd="helm history magnum"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ EOF
|
||||||
sed -i '1i\dependencies:' requirements.yaml
|
sed -i '1i\dependencies:' requirements.yaml
|
||||||
|
|
||||||
i=0
|
i=0
|
||||||
until ($helm_history_cmd | grep magnum) || (helm dep update && $helm_install_cmd); do
|
until ($helm_history_cmd | grep magnum | grep deployed) || (helm dep update && $helm_install_cmd); do
|
||||||
i=$((i + 1))
|
i=$((i + 1))
|
||||||
[ $i -lt 60 ] || break;
|
[ $i -lt 60 ] || break;
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
Loading…
Reference in New Issue