Merge branch 'main' into increase-udp-buffer-sizes

.github/workflows/build-arm64.yaml

@@ -9,7 +9,7 @@ on:
 jobs:
 
   build:
-    runs-on: github-arm64-2c-8gb
+    runs-on: ARM64
     env:
       ARCH: amd64
     steps:

.github/workflows/pr.yaml

@@ -30,7 +30,7 @@ jobs:
           go run main.go $PKG_ALL_CHANGED_FILES
 
   build-arm64:
-    runs-on: github-arm64-2c-8gb
+    runs-on: ARM64
     env:
       ARCH: amd64
     steps:

packages/firmware/opensuse/collection.yaml

@@ -4,7 +4,7 @@ packages:
     version: "20170419-5.220"
   - name: "u-boot-rpi64"
     category: "firmware"
-    version: "2024.04-2.1"
+    version: "2024.07-2.1"
     labels:
       autobump.strategy: "custom"
       autobump.string_replace: '{ "prefix": "" }'
@@ -16,11 +16,11 @@ packages:
       # We do assume that checksum is sha256
       autobump.checksum_hook: |
         curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/$(curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml | dasel -r xml 'repomd.data.[0].location.-href') | zstd -d - | dasel -r xml -w json | jq '.metadata.package[] | select(.name=="u-boot-rpiarm64") | select(.arch!="src").checksum."#text"' -r | tail -n1
-      package.version: "2024.04-2.1"
-      package.checksum: "c590b4820a8f325bfe41bc1302ea4066d9de8621bb3718a988f3f1373ff8c503356374f33aca3835832e1336367eb802c94f21d726053304ac88d11a1efd6404"
+      package.version: "2024.07-2.1"
+      package.checksum: "6a2ab9bbb860eaa81b797a0c920a20bd8497f07e8837de02c6df26bfe0101a403753f0135afeb15ef909491386be9abee78a8c58c301792c01307c2904f43a00"
   - name: "raspberrypi-firmware"
     category: "firmware"
-    version: "2024.03.27-1.1"
+    version: "2024.08.30-1.1"
     labels:
       autobump.strategy: "custom"
       autobump.string_replace: '{ "prefix": "" }'
@@ -32,11 +32,11 @@ packages:
       # We do assume that checksum is sha256
       autobump.checksum_hook: |
         curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/$(curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml | dasel -r xml 'repomd.data.[0].location.-href') | zstd -d - | dasel -r xml -w json | jq '.metadata.package[] | select(.name=="raspberrypi-firmware") | select(.arch!="src").checksum."#text"' -r | tail -n1
-      package.version: "2024.03.27-1.1"
-      package.checksum: "b557423675f8aadaa7a48c29e27dcbf2dc8a990fcc13fa7b2839dfc6afe281e54a0326bb881b244f77412d09f93df46a648abd3fb7c85716f2f207b8729e1219"
+      package.version: "2024.08.30-1.1"
+      package.checksum: "6e732a58d74f4166b07068da15f208e8c2d849a872d4b000a8ddfedb0ff041f3499b193618b746d379fe308f0ab3819bccc4491bfda4d66b35cf54e54cabfcd9"
   - name: "raspberrypi-firmware-config"
     category: "firmware"
-    version: "2024.03.27-1.1"
+    version: "2024.08.30-1.1"
     labels:
       autobump.strategy: "custom"
       autobump.string_replace: '{ "prefix": "" }'
@@ -48,8 +48,8 @@ packages:
       # We do assume that checksum is sha256
       autobump.checksum_hook: |
         curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/$(curl -s -L https://download.opensuse.org/ports/aarch64/tumbleweed/repo/oss/repodata/repomd.xml | dasel -r xml 'repomd.data.[0].location.-href') | zstd -d - | dasel -r xml -w json | jq '.metadata.package[] | select(.name=="raspberrypi-firmware-config") | select(.arch!="src").checksum."#text"' -r | tail -n1
-      package.version: "2024.03.27-1.1"
-      package.checksum: "93514ec07d396888f4f09712c8c96258d857dba0321c30dfe827ebeb6887f5904f080a0947e51f269868530ac6a67b9054caf97abd57b12ce3984cc721d58bee"
+      package.version: "2024.08.30-1.1"
+      package.checksum: "860644affd70cfb2e258808ef49e3dad50aec5283e59e2f17aff4484411bce5f1702cc3ce47b5210f8d5526e034d944f9dc3251d6c5bc40efa0a42b630cbc487"
   - name: "raspberrypi-firmware-dt"
     category: "firmware"
     version: "2023.11.21-3.3"

packages/k8s/k3s/build.yaml

@@ -10,7 +10,7 @@ env:
   - INSTALL_K3S_SKIP_SELINUX_RPM="true"
   # Remove any possible "+N" from the end of the version. We only bump that to
   # avoid overwritting existing images when we want the package to be rebuilt.
-  - INSTALL_K3S_VERSION=v{{ regexReplaceAll "\\+\\d+$" .Values.version "" }}+k3s1
+  - INSTALL_K3S_VERSION=v{{ regexReplaceAll "\\+\\d+$" .Values.version "" }}+k3s{{.Values.k3s_version}}
   {{$arch:=(default "amd64" .Values.arch)}}
   {{ if eq $arch "arm" }}
   - ARCH=arm64

packages/k8s/k3s/collection.yaml

@@ -1,78 +1,78 @@
 packages:
   - name: k3s-openrc
     category: k8s
-    version: "1.30.4"
-    k3s_version: "2"
+    version: "1.31.1"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
       autobump.sed_script: 's/\+k3s[0-9]//g'
-      autobump.skip_if_contains: '["rc"]'
+      autobump.skip_if_contains: '["k3s"]' # disable autobump
     uri:
       - https://github.com/k3s-io/k3s
     license: "APL-2"
     description: " Lightweight Kubernetes "
   - name: k3s-openrc
     category: k8s
-    version: "1.28.9"
-    k3s_version: "2"
+    version: "1.30.5"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
       autobump.sed_script: 's/\+k3s1[0-9]//g'
-      autobump.skip_if_contains: '["rc"]'
+      autobump.skip_if_contains: '["k3s"]' # disable autobump
     uri:
       - https://github.com/k3s-io/k3s
     license: "APL-2"
     description: " Lightweight Kubernetes "
   - name: k3s-openrc
     category: k8s
-    version: "1.29.4"
-    k3s_version: "2"
+    version: "1.29.9"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
       autobump.sed_script: 's/\+k3s[0-9]//g'
-      autobump.skip_if_contains: '["rc"]'
+      autobump.skip_if_contains: '["k3s"]' # disable autobump
     uri:
       - https://github.com/k3s-io/k3s
     license: "APL-2"
     description: " Lightweight Kubernetes "
   - name: k3s-systemd
     category: k8s
-    version: "1.30.4"
-    k3s_version: "2"
+    version: "1.31.1"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
       autobump.sed_script: 's/\+k3s[0-9]//g'
-      autobump.skip_if_contains: '["rc"]'
+      autobump.skip_if_contains: '["k3s"]' # disable autobump
     uri:
       - https://github.com/k3s-io/k3s
     license: "APL-2"
     description: " Lightweight Kubernetes "
   - name: k3s-systemd
     category: k8s
-    version: "1.28.9"
-    k3s_version: "2"
+    version: "1.30.5"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
       autobump.sed_script: 's/\+k3s[0-9]//g'
-      autobump.skip_if_contains: '["rc"]'
+      autobump.skip_if_contains: '["k3s"]' # disable autobump
     uri:
       - https://github.com/k3s-io/k3s
     license: "APL-2"
     description: " Lightweight Kubernetes "
   - name: k3s-systemd
     category: k8s
-    version: "1.29.4"
-    k3s_version: "2"
+    version: "1.29.9"
+    k3s_version: "1"
     labels:
       github.owner: "k3s-io"
       github.repo: "k3s"
       autobump.sed_script: 's/\+k3s[0-9]//g'
-      autobump.skip_if_contains: '["rc"]'
+      autobump.skip_if_contains: '["k3s"]' # disable autobump
     uri:
       - https://github.com/k3s-io/k3s
     license: "APL-2"

packages/kernels/linux-rpi/build.yaml

@@ -0,0 +1,17 @@
+package_dir: /out
+
+image: ubuntu:24.04
+
+prelude:
+  - apt-get update -y && apt-get install -y gcc gcc-aarch64-linux-gnu git make flex bc bison libssl-dev xz-utils kmod
+  - git clone --branch {{ .Values.version }} --depth 1 https://github.com/raspberrypi/linux.git linux
+
+steps:
+  - mkdir -p make /build
+  - mkdir -p /out/boot/overlays
+  - cd linux && CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 make O=/build bcm2711_defconfig
+  - cd linux && CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 make O=/build -j $(nproc) Image.gz modules dtbs
+  - cd linux && CROSS_COMPILE=aarch64-linux-gnu- ARCH=arm64 make O=/build INSTALL_MOD_PATH=/out modules_install
+  - cp /build/arch/arm64/boot/dts/broadcom/*.dtb /out/boot/
+  - cp /build/arch/arm64/boot/dts/overlays/*.dtb* /out/boot/overlays/
+  - cp /build/arch/arm64/boot/Image.gz /out/boot/Image

packages/kernels/linux-rpi/collection.yaml

@@ -0,0 +1,9 @@
+packages:
+  - name: "linux-rpi"
+    category: "kernels"
+    version: "rpi-6.6.y"
+    labels:
+      github.repo: "raspberrypi"
+      autobump.revdeps: "true"
+      github.owner: "kernel"
+      autobump.skip_if_contains: '["rc"]'

packages/static/kairos-overlay-files/collection.yaml

@@ -1,4 +1,4 @@
 packages:
   - name: "kairos-overlay-files"
     category: "static"
-    version: "1.1.47"
+    version: "1.1.52"

packages/static/kairos-overlay-files/files/system/oem/00_home_dir_owner_fix.yaml

@@ -1,15 +1,6 @@
 name: "Fix home directory permissions (kairos issue #2797)"
 stages:
-  initramfs.after:
-    - name: "Fix permissions"
+  network.after:
+    - name: "Fix home dir ownership"
       commands:
-        - |
-          # Iterate over users in /etc/passwd and chown their directories
-          awk -F: '$3 >= 1000 && $6 ~ /^\/home\// {print $1, $6}' /etc/passwd | while read -r user homedir; do
-              if [ -d "$homedir" ]; then  # Check if the home directory exists
-                  echo "Changing ownership of $homedir to $user"
-                  chown -R "$user":"$user" "$homedir"
-              else
-                  echo "Directory $homedir does not exist for user $user"
-              fi
-          done
+        - "/usr/bin/fix-home-dir-ownership"

packages/static/kairos-overlay-files/files/system/oem/11_RPI.yaml

@@ -1,4 +1,3 @@
-#cloud-config
 name: "RPI configs"
 stages:
   initramfs.before:

packages/static/kairos-overlay-files/files/usr/bin/fix-home-dir-ownership

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -e
+
+SENTINEL_FILE="/usr/local/.kairos/skip-home-directory-ownership-fix"
+
+if [ -f $SENTINEL_FILE ]; then
+    echo "Skipping ownership fix because sentinel file was found: $SENTINEL_FILE"
+    exit 0
+fi
+
+# Iterate over users in /etc/passwd and chown their directories
+awk -F: '$3 >= 1000 && $6 ~ /^\/home\// {print $1, $6}' /etc/passwd | while read -r user homedir; do
+    if [ -d "$homedir" ]; then  # Check if the home directory exists
+        echo "Changing ownership of $homedir to $user"
+        chown -R "$user":"$user" "$homedir"
+    else
+        echo "Directory $homedir does not exist for user $user"
+    fi
+done
+
+# Write the sentinel file
+mkdir -p "$(dirname $SENTINEL_FILE)"
+echo "https://github.com/kairos-io/kairos/issues/2843" > $SENTINEL_FILE

packages/system/kairos-agent/collection.yaml

@@ -1,7 +1,7 @@
 packages:
   - name: "kairos-agent"
     category: "system"
-    version: "2.13.4"
+    version: "2.14.5"
     labels:
       github.repo: "kairos-agent"
       autobump.revdeps: "true"
@@ -12,7 +12,7 @@ packages:
     description: "Lifecycle agent for kairos"
   - name: "kairos-agent"
     category: "fips"
-    version: "2.13.4"
+    version: "2.14.5"
     labels:
       github.repo: "kairos-agent"
       autobump.revdeps: "true"

packages/system/provider-kairos/collection.yaml

@@ -1,7 +1,7 @@
 packages:
   - name: "provider-kairos"
     category: "system"
-    version: "2.7.3"
+    version: "2.7.4"
     labels:
       github.repo: "provider-kairos"
       github.owner: "kairos-io"

packages/system/systemd/collection.yaml

@@ -1,7 +1,7 @@
 packages:
   - name: "systemd-boot"
     category: "system"
-    version: "256.5"
+    version: "256.6"
     labels:
       github.repo: "systemd"
       autobump.revdeps: "true"

packages/toolchain-go/collection.yaml

@@ -2,7 +2,7 @@ packages:
   - name: toolchain-go
     category: development
     variant: "alpine"
-    version: "1.23.0"
+    version: "1.23.1"
     hidden: true
     labels:
       autobump.revdeps: "false"
@@ -13,11 +13,11 @@ packages:
         curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g'
       autobump.version_hook: |
         curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g'
-      package.version: "1.23.0"
+      package.version: "1.23.1"
   - name: toolchain-go-ubuntu
     variant: "bookworm"
     category: development
-    version: "1.23.0"
+    version: "1.23.1"
     hidden: true
     labels:
       autobump.revdeps: "false"
@@ -28,7 +28,7 @@ packages:
         curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g'
       autobump.version_hook: |
         curl -s -L "https://go.dev/dl/?mode=json" |jq -r '.[0].version'| sed 's/go//g'
-      package.version: "1.23.0"
+      package.version: "1.23.1"
   - name: toolchain-go
     category: development
     variant: "alpine"
@@ -68,8 +68,8 @@ packages:
   - name: toolchain-go
     category: fips
     variant: "alpine"
-    version: "1.22.5"
-    tag: "1.22.5"
+    version: "1.23.1"
+    tag: "1.23.1"
     hidden: true
   - name: toolchain-go-ubuntu
     category: fips
@@ -80,6 +80,6 @@ packages:
   - name: toolchain-go-ubuntu
     category: fips
     variant: "bullseye"
-    version: "1.22.5"
-    tag: "1.22.5"
+    version: "1.23.1"
+    tag: "1.23.1"
     hidden: true

packages/utils/goreleaser/definition.yaml

@@ -1,6 +1,6 @@
 name: goreleaser
 category: utils
-version: "2.2.0"
+version: "2.3.2"
 description: "Deliver Go binaries as fast and easily as possible"
 labels:
   github.repo: "goreleaser"

packages/utils/helm/definition.yaml

@@ -1,6 +1,6 @@
 name: "helm"
 category: "utils"
-version: "3.15.4"
+version: "3.16.1"
 description: "The Kubernetes Package Manager"
 license: "Apache-2.0"
 labels:

packages/utils/kube-vip/definition.yaml

@@ -1,6 +1,6 @@
 name: kube-vip
 category: utils
-version: "0.8.2"
+version: "0.8.3"
 labels:
   github.repo: "kube-vip"
   github.owner: "kube-vip"

packages/utils/nerdctl/definition.yaml

@@ -1,6 +1,6 @@
 name: "nerdctl"
 category: "utils"
-version: "2.0.0-rc.1"
+version: "2.0.0-rc.2"
 tag: "1.7.2"
 platform: linux
 labels:

packages/utils/operator-sdk/definition.yaml

@@ -1,6 +1,6 @@
 name: operator-sdk
 category: utils
-version: "1.36.1"
+version: "1.37.0"
 description: " SDK for building Kubernetes applications. Provides high level APIs, useful abstractions, and project scaffolding. "
 labels:
   github.repo: "operator-sdk"