From 8c40acc168814aa6327fd7b9a16572b768ff13d1 Mon Sep 17 00:00:00 2001
From: Knut Ahlers <knut@ahlers.me>
Date: Fri, 15 Mar 2024 22:31:52 +0100
Subject: [PATCH] Apply updates, add calico preparations

Signed-off-by: Knut Ahlers <knut@ahlers.me>
---
 config.yaml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/config.yaml b/config.yaml
index 8ca5efc..6dc686d 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,9 +1,9 @@
 ---
 
-apk_tools_version: v2.12.11
+apk_tools_version: v2.14.1
 apk_tools_arch: x86_64
 apk_tools_url: https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//{{ apk_tools_version }}/{{ apk_tools_arch }}/apk.static
-apk_tools_checksum: sha256:a77621da3475ae0ed92daa2d05b9c2bb671639af8c17cce44098192dfbe1b80b
+apk_tools_checksum: sha256:273227b3fdece78c8a32ba65cb14a9590988d5290f6d5ba53f2f37cbc5a7e3f5
 
 alpine_mirror: https://dl-cdn.alpinelinux.org/alpine
 alpine_repositories:
@@ -62,7 +62,6 @@ packages:
   open-iscsi-openrc: ''
   udev: ''
 
-  cni-plugin-flannel: '@community'
   cni-plugins: '@community'
   cri-tools: '@community'
   containerd: '@community'
@@ -70,9 +69,9 @@ packages:
   nfs-utils: ''
   uuidgen: ''
 
-  kubelet: '@luzifer=1.28.3-r0'
-  kubeadm: '@luzifer=1.28.3-r0'
-  kubectl: '@luzifer=1.28.3-r0'
+  kubelet: '@luzifer=1.29.3-r0'
+  kubeadm: '@luzifer=1.29.3-r0'
+  kubectl: '@luzifer=1.29.3-r0'
 
 services:
   devfs: sysinit
@@ -145,4 +144,8 @@ chroot_commands:
   # Configure chrony
   - 'echo -e "server ptbtime1.ptb.de iburst\nserver ptbtime2.ptb.de iburst\ninitstepslew 10 ptbtime1.ptb.de\ndriftfile /var/lib/chrony/chrony.drift\nrtcsync\ncmdport 0" >/etc/chrony/chrony.conf'
 
+  # Pre-create calico CNI binary links (binaries are provided by CNI)
+  - 'ln -sf /opt/cni/bin/calico /usr/libexec/cni/calico'
+  - 'ln -sf /opt/cni/bin/calico-ipam /usr/libexec/cni/calico-ipam'
+
 ...