diff --git a/infrastructure/system-upgrades/kubernetes.yaml b/infrastructure/system-upgrades/kubernetes.yaml index 2387a388ade9bc5c204aa1353f9b5a868de961d9..309307a9abb33c918072309636032722bcd8784f 100644 --- a/infrastructure/system-upgrades/kubernetes.yaml +++ b/infrastructure/system-upgrades/kubernetes.yaml @@ -19,8 +19,9 @@ stringData: set -e set -x secrets="$(dirname "$0")" - systemd-run --same-dir --wait --collect --service-type=exec dnf upgrade -y kubernetes kubernetes-kubeadm + systemd-run --same-dir --wait --collect --service-type=exec dnf upgrade -y kubernetes-kubeadm kubeadm upgrade apply --yes + systemd-run --same-dir --wait --collect --service-type=exec dnf upgrade -y kubernetes-kubeadm upgrade.sh: | #!/bin/bash set -e @@ -54,9 +55,8 @@ spec: deleteLocalData: true ignoreDaemonSets: true force: false - version: "1.21" + version: "1.0" upgrade: image: docker.io/library/fedora:35 command: ["chroot", "/host"] args: ["sh", "/run/system-upgrade/secrets/kubernetes-upgrade/upgrade.sh"] - diff --git a/infrastructure/system-upgrades/kustomization.yaml b/infrastructure/system-upgrades/kustomization.yaml index b9d2de52fb6d110a725e36f46cf0dac4bfc2f868..7d47ea412c9610ce0e75f5583f151b8289e0ff75 100644 --- a/infrastructure/system-upgrades/kustomization.yaml +++ b/infrastructure/system-upgrades/kustomization.yaml @@ -4,6 +4,7 @@ namespace: system-upgrade resources: - calver-server.yaml - fedora.yaml + - kubernetes.yaml - kubelet.yaml - longhorn-lvm.yaml - longhorn-setup.yaml