diff --git a/infrastructure/system-upgrades/kubernetes.yaml b/infrastructure/system-upgrades/kubernetes.yaml index 6b3986dbdf4a4b038e4dcbc2a869412991557fd5..38963c6ca158de0a74b26e41e12c7db375ef81b5 100644 --- a/infrastructure/system-upgrades/kubernetes.yaml +++ b/infrastructure/system-upgrades/kubernetes.yaml @@ -14,12 +14,15 @@ stringData: secrets="$(dirname "$0")" systemd-run --same-dir --wait --collect --service-type=exec dnf install -y dnf-plugins-core systemd-run --same-dir --wait --collect --service-type=exec dnf copr enable -y "sheogorath/kubernetes-$(cat $secrets/kubernetes-version)" - kubernetes-upgrade.sh: | + upgrade-kubeadm.sh: | #!/bin/bash set -e set -x - secrets="$(dirname "$0")" systemd-run --same-dir --wait --collect --service-type=exec dnf upgrade -y kubernetes-kubeadm + upgrade-kubernetes.sh: | + #!/bin/bash + set -e + set -x if [ "$1" = "first" ]; then kubeadm upgrade apply --yes "$(kubeadm version -o short)" else @@ -33,10 +36,11 @@ stringData: set -x secrets="/run/system-upgrade/secrets/kubernetes-upgrade" chroot /host sh "$secrets/setup-copr.sh" + chroot /host sh "$secrets/upgrade-kubeadm.sh" if ! /host/usr/bin/kubectl get pods -n kube-system -o yaml | grep "kube-apiserver:$(/host/usr/bin/kubeadm version -o short)"; then - chroot /host sh "$secrets/kubernetes-upgrade.sh" "first" + chroot /host sh "$secrets/upgrade-kubernetes.sh" "first" else - chroot /host sh "$secrets/kubernetes-upgrade.sh" + chroot /host sh "$secrets/upgrade-kubernetes.sh" fi --- apiVersion: upgrade.cattle.io/v1