From accfcf17df69062f567b7def112c0050ad21b35b Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Fri, 12 Jan 2024 00:48:07 +0100
Subject: [PATCH] feat(system-upgrade): Configure kubelet to load local config
---
infrastructure/system-upgrades/kubelet.yaml | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/infrastructure/system-upgrades/kubelet.yaml b/infrastructure/system-upgrades/kubelet.yaml
index d437e0919..daed3ec61 100644
--- a/infrastructure/system-upgrades/kubelet.yaml
+++ b/infrastructure/system-upgrades/kubelet.yaml
@@ -6,7 +6,10 @@ metadata:
namespace: system-upgrade
type: Opaque
stringData:
- kubelet.service: |
+ local.conf: |
+ [Service]
+ Environment="KUBELET_EXTRA_ARGS=--cgroup-driver=systemd --config=config.yaml"
+ flux.conf: |
[Service]
Environment="KUBELET_AUTHZ_ARGS=--authorization-mode=Webhook --authentication-token-webhook --client-ca-file=/etc/kubernetes/pki/ca.crt"
upgrade.sh: |
@@ -15,7 +18,8 @@ stringData:
set -x
secrets="$(dirname $0)"
rm -f /etc/systemd/system/kubelet.service.d/flux.conf /etc/systemd/system/kubelet.service.d/kubeadm-flux.conf
- cp "$secrets/kubelet.service" /etc/systemd/system/kubelet.service.d/zz_flux.conf
+ cp "$secrets/flux.conf" /etc/systemd/system/kubelet.service.d/zz_flux.conf
+ cp "$secrets/local.conf" /etc/systemd/system/kubelet.service.d/zz_defaults.conf
systemctl daemon-reload
systemctl restart kubelet.service
---
@@ -37,6 +41,7 @@ spec:
values:
- "37"
- "38"
+ - "39"
serviceAccountName: system-upgrade
drain:
deleteLocalData: true
@@ -45,7 +50,7 @@ spec:
secrets:
- name: kubelet
path: /host/run/system-upgrade/secrets/kubelet
- version: "1.0.0"
+ version: "1.1.0"
upgrade:
image: quay.io/fedora/fedora:39
command: ["chroot", "/host"]
--
GitLab