From b6588e55d1d039e1c4aad9ba0de72e6e94715e52 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 11 Nov 2022 01:03:33 +0100
Subject: [PATCH] fix(system-upgrade): remove version duplication from
kubernetes deployment
---
infrastructure/system-upgrades/kubernetes.yaml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/infrastructure/system-upgrades/kubernetes.yaml b/infrastructure/system-upgrades/kubernetes.yaml
index c77123c9c..0e245271c 100644
--- a/infrastructure/system-upgrades/kubernetes.yaml
+++ b/infrastructure/system-upgrades/kubernetes.yaml
@@ -6,7 +6,6 @@ metadata:
namespace: system-upgrade
type: Opaque
stringData:
- kubernetes-version: "1.23"
disable-distro-updates.sh: |
#!/bin/bash
set -e
@@ -19,7 +18,7 @@ stringData:
set -x
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)"
+ systemd-run --same-dir --wait --collect --service-type=exec dnf copr enable -y "sheogorath/kubernetes-$(echo "$SYSTEM_UPGRADE_PLAN_LATEST_VERSION" | grep -Poe "\d+\.\d+")"
upgrade-kubeadm.sh: |
#!/bin/bash
set -e
--
GitLab