Update to 1.29.1+k3s2; refresh patches

10 files changed, 57 insertions, 140 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5f134d39152b..91c72a509db0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = k3s
 	pkgdesc = Lightweight Kubernetes
-	pkgver = 1.29.0+k3s1
+	pkgver = 1.29.1+k3s2
 	pkgrel = 1
 	url = https://k3s.io
 	arch = x86_64
@@ -11,29 +11,25 @@ pkgbase = k3s
 	backup = etc/systemd/system/k3s.service.env
 	backup = etc/systemd/system/k3s-agent.service.env
 	backup = etc/rancher/k3s/config.yaml
-	source = git+https://github.com/k3s-io/k3s#tag=v1.29.0+k3s1
+	source = git+https://github.com/k3s-io/k3s#tag=v1.29.1+k3s2
 	source = k3s.service.env
 	source = k3s-agent.service.env
 	source = config.yaml
-	source = 0000-Fix-issue-8293.-Remove-useless-log-init-code.patch
-	source = 0001-Dockerfile.dapper-set-HOME-properly.patch
-	source = 0002-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
-	source = 0003-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
-	source = 0004-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
-	source = 0005-Dockerfile.dapper-sanitize-cache-configuration.patch
-	source = 0006-.service-update-systemd-service-files.patch
-	source = 0007-scripts-moar-compression-drop-pigz-and-raw-tar.patch
+	source = 0001-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
+	source = 0002-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
+	source = 0003-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
+	source = 0004-Dockerfile.dapper-sanitize-cache-configuration.patch
+	source = 0005-.service-update-systemd-service-files.patch
+	source = 0006-scripts-moar-compression-drop-pigz-and-raw-tar.patch
 	sha256sums = SKIP
 	sha256sums = 94b0dd21fa4f075d4db7f6efe7a775de476b278de72f99773ee3de0bb54e7f68
 	sha256sums = 2f6964aed46deb38095801e124a6603f3a29e6886815d52c59c02883f7a37925
 	sha256sums = 6f0500a656ed78c0bb689c12264dbcd79f579edc3b9e17d512be742c1b2c43a4
-	sha256sums = fe667d538cf94bf8f9a62d9812a03bf423204f452aa11f0f2addf0dbe1b95866
-	sha256sums = 9307c9dbec1bdd73a1a3186668e0f5d5c9900474f53a842a133feba62c92b0ac
-	sha256sums = 350438be7abe98eeee60f23e9aa566eba38df5422597ab4e7184cc7a12309ebb
-	sha256sums = 659ee5e6a7c7df532418032e7b115ab7804fd60593e497814cc553504545af3c
-	sha256sums = 6e00974e4ec3ee5999da87c7d1e43fed5b64e84ce6eec3a43ed971f24c5cb820
-	sha256sums = 616063a668d510f163aa684e78fcf89d1b8cc8e1524acdc170608bfbf0e80e47
-	sha256sums = bb721e8850eb736ad9aad4f0a8ef20dac0e06d7731731c3541264f138be28b74
-	sha256sums = f448303dbbefef2645b8c2146d595643c0143c7300eab12a459b85a3b18b3d91
+	sha256sums = e36e378f2faec39037cf9bcd016a8915ceee9aa61ab9ff739a21a66493b961f5
+	sha256sums = ad47b74ad7e9cd2055e8646f9979373cf7dd1d969ad87387fc20f816287273d8
+	sha256sums = 06467ca8182dc91b7f8b3b8dae5982cb00f4db8f98fd5e3f180808ee0d972929
+	sha256sums = f8eeeb45a27bceeacdda64b5604a7bd3629f9f1127f96d4000df9b67a4b062e1
+	sha256sums = 44d4e299914e80c072e543356939c1b1fc51c586bc4d3ac587b24bddbd61aa40
+	sha256sums = 452ae401363582616d649fc13f92a11cfa7e1c847cb252e540cc49618583b0b8
 
 pkgname = k3s
diff --git a/0000-Fix-issue-8293.-Remove-useless-log-init-code.patch b/0000-Fix-issue-8293.-Remove-useless-log-init-code.patch
deleted file mode 100644
index fa275bf5d134..000000000000
--- a/0000-Fix-issue-8293.-Remove-useless-log-init-code.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From f349e309ed9e06c028e6f3938abbbce246235c60 Mon Sep 17 00:00:00 2001
-From: Linshen Lee <1061696872@qq.com>
-Date: Fri, 15 Dec 2023 22:17:32 +0900
-Subject: [PATCH] Fix: issue #8293. Remove useless log init code Signed-off-by:
- Linshen Lee 1061696872@qq.com
-
----
- pkg/cli/cmds/log.go | 6 ------
- 1 file changed, 6 deletions(-)
-
-diff --git a/pkg/cli/cmds/log.go b/pkg/cli/cmds/log.go
-index ea778ac668..7e34b10136 100644
---- a/pkg/cli/cmds/log.go
-+++ b/pkg/cli/cmds/log.go
-@@ -1,9 +1,7 @@
- package cmds
- 
- import (
--	"flag"
- 	"fmt"
--	"strconv"
- 	"sync"
- 	"time"
- 
-@@ -73,10 +71,6 @@ func checkUnixTimestamp() error {
- }
- 
- func setupLogging() {
--	flag.Set("v", strconv.Itoa(LogConfig.VLevel))
--	flag.Set("vmodule", LogConfig.VModule)
--	flag.Set("alsologtostderr", strconv.FormatBool(Debug))
--	flag.Set("logtostderr", strconv.FormatBool(!Debug))
- 	if Debug {
- 		logrus.SetLevel(logrus.DebugLevel)
- 	}
--- 
-2.43.0
-
diff --git a/0001-Dockerfile.dapper-set-HOME-properly.patch b/0001-Dockerfile.dapper-set-HOME-properly.patch
deleted file mode 100644
index 9b6db78c3130..000000000000
--- a/0001-Dockerfile.dapper-set-HOME-properly.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 18b1172fb9d59b50ab8473235c8954097b2a2850 Mon Sep 17 00:00:00 2001
-From: Ivan Shapovalov <intelfx@intelfx.name>
-Date: Fri, 22 Dec 2023 22:43:56 +0100
-Subject: [PATCH 1/7] Dockerfile.dapper: set $HOME properly
-
-`$HOME` refers to `$DAPPER_SOURCE`, which is set in the same expression
-and is thus not visible at the time of substitution.
-
-This problem is not immediately visible with Docker, Inc.'s docker
-merely because it resets an unset `$HOME` to `/root` (but still breaking
-the Go cache). Under podman, this problem is immediately visible because
-an unset `$HOME` remains unset and subsequently breaks the `go generate`
-invocation.
-
-Fixes #9089.
-
-Signed-off-by: Ivan Shapovalov <intelfx@intelfx.name>
----
- Dockerfile.dapper | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/Dockerfile.dapper b/Dockerfile.dapper
-index af99d3d35e..2f0cd5e64d 100644
---- a/Dockerfile.dapper
-+++ b/Dockerfile.dapper
-@@ -56,9 +56,10 @@ ENV DAPPER_RUN_ARGS="--privileged -v k3s-cache:/go/src/github.com/k3s-io/k3s/.ca
-     DAPPER_SOURCE="/go/src/github.com/k3s-io/k3s/" \
-     DAPPER_OUTPUT="./bin ./dist ./build/out ./build/static ./pkg/static ./pkg/deploy" \
-     DAPPER_DOCKER_SOCKET=true \
--    HOME=${DAPPER_SOURCE} \
-     CROSS=true \
-     STATIC_BUILD=true
-+# Set $HOME separately because it refers to $DAPPER_SOURCE, set above
-+ENV HOME=${DAPPER_SOURCE}
- 
- WORKDIR ${DAPPER_SOURCE}
- 
--- 
-2.43.0
-
diff --git a/0002-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch b/0001-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
index 8675b37965e8..f4b287e7f842 100644
--- a/0002-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
+++ b/0001-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch
@@ -1,7 +1,7 @@
-From 447968ac1d6fc95ad71b93b400ce519ac740d8e3 Mon Sep 17 00:00:00 2001
+From 175849ddb4d9bb79a161dd32d16d25182ed2e866 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 01:10:59 +0100
-Subject: [PATCH 2/7] main: apply go-fmt to pkg/data/zz_generated_bindata.go
+Subject: [PATCH 1/6] main: apply go-fmt to pkg/data/zz_generated_bindata.go
 
 No reason other than for consistency.
 ---
@@ -21,5 +21,5 @@ index 8857094b87..c004a927bc 100644
  //go:generate go fmt pkg/static/zz_generated_bindata.go
  
 -- 
-2.43.0
+2.43.1
 
diff --git a/0003-.dockerignore-do-not-ignore-parts-of-GITDIR.patch b/0002-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
index 60084553a8f3..3002871ea262 100644
--- a/0003-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
+++ b/0002-.dockerignore-do-not-ignore-parts-of-GITDIR.patch
@@ -1,7 +1,7 @@
-From 53f939037c313880efcf39c7e6fcbf4cb9a713e2 Mon Sep 17 00:00:00 2001
+From 3ba3969ac964f47c707e39929bdca9146a0cfb04 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 01:07:38 +0100
-Subject: [PATCH 3/7] .dockerignore: do not ignore parts of $GITDIR
+Subject: [PATCH 2/6] .dockerignore: do not ignore parts of $GITDIR
 
 ---
  .dockerignore | 1 -
@@ -18,5 +18,5 @@ index e1651fd70d..36131d3744 100644
 -./.git/objects/pack
 \ No newline at end of file
 -- 
-2.43.0
+2.43.1
 
diff --git a/0004-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch b/0003-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
index a86b1df96486..f1b58899a107 100644
--- a/0004-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
+++ b/0003-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch
@@ -1,7 +1,7 @@
-From fe83fb9745c429ac6ba4bb4aa97f538762be0e11 Mon Sep 17 00:00:00 2001
+From a17b8811b756090530b2b5c4bab1d6c8d8078313 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 01:11:52 +0100
-Subject: [PATCH 4/7] Dockerfile.dapper: sanitize $DAPPER_OUTPUT
+Subject: [PATCH 3/6] Dockerfile.dapper: sanitize $DAPPER_OUTPUT
 
 Existing $DAPPER_OUTPUT is not enough to be able to run build steps
 sequentially (i. e. `make download; make generate; make build;
@@ -16,7 +16,7 @@ extracting anything other than the final artifacts.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Dockerfile.dapper b/Dockerfile.dapper
-index 2f0cd5e64d..5ae64df57b 100644
+index e4de59f4fe..6d0c6629c2 100644
 --- a/Dockerfile.dapper
 +++ b/Dockerfile.dapper
 @@ -54,7 +54,7 @@ ENV SELINUX=${SELINUX}
@@ -29,5 +29,5 @@ index 2f0cd5e64d..5ae64df57b 100644
      CROSS=true \
      STATIC_BUILD=true
 -- 
-2.43.0
+2.43.1
 
diff --git a/0005-Dockerfile.dapper-sanitize-cache-configuration.patch b/0004-Dockerfile.dapper-sanitize-cache-configuration.patch
index 3c3af08dd7e4..15a6ef05d058 100644
--- a/0005-Dockerfile.dapper-sanitize-cache-configuration.patch
+++ b/0004-Dockerfile.dapper-sanitize-cache-configuration.patch
@@ -1,7 +1,7 @@
-From 1f17fa5bf080101dddc6ff4100ad38296faa8a4a Mon Sep 17 00:00:00 2001
+From ebff679efbae2daab82edebeded7ac632a3246af Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 01:08:37 +0100
-Subject: [PATCH 5/7] Dockerfile.dapper: sanitize cache configuration
+Subject: [PATCH 4/6] Dockerfile.dapper: sanitize cache configuration
 
 - set $HOME to /root because there is no good reason to keep it in $PWD
 - mount volumes to /go/pkg to cache downloaded Go sources (we'd set it
@@ -23,7 +23,7 @@ index 36131d3744..c7418f3674 100644
  ./.trash-cache
 +./.dapper-cache
 diff --git a/Dockerfile.dapper b/Dockerfile.dapper
-index 5ae64df57b..5c49581a76 100644
+index 6d0c6629c2..fb85c961ff 100644
 --- a/Dockerfile.dapper
 +++ b/Dockerfile.dapper
 @@ -50,8 +50,13 @@ RUN if [ "$(go env GOARCH)" = "amd64" ]; then \
@@ -63,5 +63,5 @@ index 620f899894..50af6aa110 100644
  
  .PHONY: deps
 -- 
-2.43.0
+2.43.1
 
diff --git a/0006-.service-update-systemd-service-files.patch b/0005-.service-update-systemd-service-files.patch
index c8cf9707dd48..cdd3408022d4 100644
--- a/0006-.service-update-systemd-service-files.patch
+++ b/0005-.service-update-systemd-service-files.patch
@@ -1,7 +1,7 @@
-From 3399f01e871f3a87d01f94841a522b9b8aba352e Mon Sep 17 00:00:00 2001
+From 63613b2da29ba0d7c98dacc1d1dff29b00099195 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 02:10:11 +0100
-Subject: [PATCH 6/7] *.service: update systemd service files
+Subject: [PATCH 5/6] *.service: update systemd service files
 
 ---
  k3s-agent-rootless.service | 47 ++++++++++++++++++++++++++++++++++++++
@@ -144,7 +144,7 @@ index 5879e2f8f2..916af05c6d 100644
  [Install]
  WantedBy=default.target
 diff --git a/k3s.service b/k3s.service
-index 7f8c9ec89c..c786114ce0 100644
+index 70ce10c1aa..c786114ce0 100644
 --- a/k3s.service
 +++ b/k3s.service
 @@ -1,16 +1,16 @@
@@ -162,7 +162,7 @@ index 7f8c9ec89c..c786114ce0 100644
  EnvironmentFile=-/etc/default/%N
  EnvironmentFile=-/etc/sysconfig/%N
 -EnvironmentFile=-/etc/systemd/system/k3s.service.env
--ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service'
+-ExecStartPre=/bin/sh -xc '! /usr/bin/systemctl is-enabled --quiet nm-cloud-setup.service 2>/dev/null'
 -ExecStart=/usr/local/bin/k3s server
 +EnvironmentFile=-/etc/systemd/system/%n.env
 +ExecStart=/usr/bin/k3s server $K3S_EXEC
@@ -171,5 +171,5 @@ index 7f8c9ec89c..c786114ce0 100644
  Delegate=yes
  # Having non-zero Limit*s causes performance problems due to accounting overhead
 -- 
-2.43.0
+2.43.1
 
diff --git a/0007-scripts-moar-compression-drop-pigz-and-raw-tar.patch b/0006-scripts-moar-compression-drop-pigz-and-raw-tar.patch
index 969e1c978170..8f8fa2dce285 100644
--- a/0007-scripts-moar-compression-drop-pigz-and-raw-tar.patch
+++ b/0006-scripts-moar-compression-drop-pigz-and-raw-tar.patch
@@ -1,20 +1,23 @@
-From b5f0aa8933a97aef7f255b8b71bb6bc12c9d06a6 Mon Sep 17 00:00:00 2001
+From 3b1dd94cef03f2bbe42d8eedf2cc4d6a3813f2b0 Mon Sep 17 00:00:00 2001
 From: Ivan Shapovalov <intelfx@intelfx.name>
 Date: Sat, 23 Dec 2023 02:12:21 +0100
-Subject: [PATCH 7/7] scripts: moar compression, drop pigz and raw tar
+Subject: [PATCH 6/6] scripts: moar compression, drop pigz and raw tar
 
 ---
- scripts/package-airgap | 10 +++++-----
+ scripts/package-airgap | 12 +++++++-----
  scripts/package-cli    |  7 ++++---
- 2 files changed, 9 insertions(+), 8 deletions(-)
+ 2 files changed, 11 insertions(+), 8 deletions(-)
 
 diff --git a/scripts/package-airgap b/scripts/package-airgap
-index 911357181a..4953a9639b 100755
+index 911357181a..2f237c91b5 100755
 --- a/scripts/package-airgap
 +++ b/scripts/package-airgap
-@@ -6,11 +6,11 @@ cd $(dirname $0)/..
+@@ -5,12 +5,14 @@ cd $(dirname $0)/..
+ 
  . ./scripts/version.sh
  
++if [[ -t 0 && -t 1 && -t 2 ]]; then xargs=(xargs -o); else xargs=(xargs); fi
++
  airgap_image_file='scripts/airgap/image-list.txt'
 -images=$(cat "${airgap_image_file}")
 -xargs -n1 docker pull <<< "${images}"
@@ -23,7 +26,7 @@ index 911357181a..4953a9639b 100755
 -pigz -v -c dist/artifacts/k3s-airgap-images-${ARCH}.tar > dist/artifacts/k3s-airgap-images-${ARCH}.tar.gz
 +airgap_tar_file="dist/artifacts/k3s-airgap-images-${ARCH}.tar"
 +readarray -t images <"${airgap_image_file}"
-+printf '%s\0' "${images[@]}" | xargs -0 -n1 -o docker pull
++printf '%s\0' "${images[@]}" | "${xargs[@]}" -0 -n1 docker pull
 +docker save "${images[@]}" -o "${airgap_tar_file}"
 +zstd -T0 --ultra -22 --long=25 --verbose --force --rm "${airgap_tar_file}"
  if [ ${ARCH} = amd64 ]; then
@@ -48,5 +51,5 @@ index c790f04aab..0452d4b4fd 100755
  cp ./build/out/data.tar.zst ./build/data/${HASH}.tar.zst
  
 -- 
-2.43.0
+2.43.1
 
diff --git a/PKGBUILD b/PKGBUILD
index d1ec6dbd64e2..81afc4325287 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Ivan Shapovalov <intelfx@intelfx.name>
 
 pkgname=k3s
-pkgver=1.29.0+k3s1
+pkgver=1.29.1+k3s2
 pkgrel=1
 pkgdesc='Lightweight Kubernetes'
 arch=(x86_64)
@@ -23,27 +23,23 @@ source=(
   'k3s.service.env'
   'k3s-agent.service.env'
   'config.yaml'
-  '0000-Fix-issue-8293.-Remove-useless-log-init-code.patch'
-  '0001-Dockerfile.dapper-set-HOME-properly.patch'
-  '0002-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch'
-  '0003-.dockerignore-do-not-ignore-parts-of-GITDIR.patch'
-  '0004-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch'
-  '0005-Dockerfile.dapper-sanitize-cache-configuration.patch'
-  '0006-.service-update-systemd-service-files.patch'
-  '0007-scripts-moar-compression-drop-pigz-and-raw-tar.patch'
+  '0001-main-apply-go-fmt-to-pkg-data-zz_generated_bindata.g.patch'
+  '0002-.dockerignore-do-not-ignore-parts-of-GITDIR.patch'
+  '0003-Dockerfile.dapper-sanitize-DAPPER_OUTPUT.patch'
+  '0004-Dockerfile.dapper-sanitize-cache-configuration.patch'
+  '0005-.service-update-systemd-service-files.patch'
+  '0006-scripts-moar-compression-drop-pigz-and-raw-tar.patch'
 )
 sha256sums=('SKIP'
             '94b0dd21fa4f075d4db7f6efe7a775de476b278de72f99773ee3de0bb54e7f68'
             '2f6964aed46deb38095801e124a6603f3a29e6886815d52c59c02883f7a37925'
             '6f0500a656ed78c0bb689c12264dbcd79f579edc3b9e17d512be742c1b2c43a4'
-            'fe667d538cf94bf8f9a62d9812a03bf423204f452aa11f0f2addf0dbe1b95866'
-            '9307c9dbec1bdd73a1a3186668e0f5d5c9900474f53a842a133feba62c92b0ac'
-            '350438be7abe98eeee60f23e9aa566eba38df5422597ab4e7184cc7a12309ebb'
-            '659ee5e6a7c7df532418032e7b115ab7804fd60593e497814cc553504545af3c'
-            '6e00974e4ec3ee5999da87c7d1e43fed5b64e84ce6eec3a43ed971f24c5cb820'
-            '616063a668d510f163aa684e78fcf89d1b8cc8e1524acdc170608bfbf0e80e47'
-            'bb721e8850eb736ad9aad4f0a8ef20dac0e06d7731731c3541264f138be28b74'
-            'f448303dbbefef2645b8c2146d595643c0143c7300eab12a459b85a3b18b3d91')
+            'e36e378f2faec39037cf9bcd016a8915ceee9aa61ab9ff739a21a66493b961f5'
+            'ad47b74ad7e9cd2055e8646f9979373cf7dd1d969ad87387fc20f816287273d8'
+            '06467ca8182dc91b7f8b3b8dae5982cb00f4db8f98fd5e3f180808ee0d972929'
+            'f8eeeb45a27bceeacdda64b5604a7bd3629f9f1127f96d4000df9b67a4b062e1'
+            '44d4e299914e80c072e543356939c1b1fc51c586bc4d3ac587b24bddbd61aa40'
+            '452ae401363582616d649fc13f92a11cfa7e1c847cb252e540cc49618583b0b8')
 
 prepare() {
   cd k3s