From f9aa2679c668600a14c7d4f43e2541305f3f246e Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Tue, 8 Mar 2022 17:59:10 +0100
Subject: [PATCH] fix(system-upgrade): Enable kubernetes upgrades
---
infrastructure/system-upgrades/kubernetes.yaml | 6 +++---
infrastructure/system-upgrades/kustomization.yaml | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/infrastructure/system-upgrades/kubernetes.yaml b/infrastructure/system-upgrades/kubernetes.yaml
index 2387a388a..309307a9a 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 b9d2de52f..7d47ea412 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
--
GitLab