fix(ci): pull in latest k0s image patches (#3612)

* fix(ci): pull in latest k0s image patches

* Update Makefile versions (#3613)

Co-authored-by: emosbaugh <371319+emosbaugh@users.noreply.github.com>

---------

Co-authored-by: replicated-ci-ec <replicated-ci-ec@replicated.com>
Co-authored-by: emosbaugh <371319+emosbaugh@users.noreply.github.com>

Author: emosbaugh

pkg/config/static/metadata-1_32.yaml

@@ -34,8 +34,8 @@ images:
     kube-proxy:
         repo: proxy.replicated.com/library/kube-proxy
         tag:
-            amd64: v1.32.13-amd64@sha256:83842f25d3c39c3acbff12c1e13386ff1cd85d5aedce5a6b284518ceea8a6563
-            arm64: v1.32.13-arm64@sha256:5cb41ad0a829588316dbeb3f72ecd1baa4e4ad6ec9c9ba57260e2c8911ae2fb6
+            amd64: v1.32.13-amd64@sha256:4ee5df86460164a440d90b2438bfd3c28c4ce142353a0c5b68c79f899930d95e
+            arm64: v1.32.13-arm64@sha256:1266152972d12901a8a08a126d7b86883a5263a159c7863c920da5250371e07d
     metrics-server:
         repo: proxy.replicated.com/library/metrics-server
         tag:

pkg/config/static/metadata-1_33.yaml

@@ -34,8 +34,8 @@ images:
     kube-proxy:
         repo: proxy.replicated.com/library/kube-proxy
         tag:
-            amd64: v1.33.10-amd64@sha256:a757e89e6858240b7788c2758d1b55349c441efbffcbf022dd29cc4efa9263cc
-            arm64: v1.33.10-arm64@sha256:2a3de8c86abe8577bd708687d56442e318b125bbd6181d79ff38364e03cce98a
+            amd64: v1.33.10-amd64@sha256:7f438ad27f933ae1186493538a43f610f2652d5c61e9084ddb3e2fe01521ead0
+            arm64: v1.33.10-arm64@sha256:8d53cbb00a76b412cc6810e6d15d3d25f507bb12e9a0e1b06a318ad3abf1a9e0
     metrics-server:
         repo: proxy.replicated.com/library/metrics-server
         tag:

pkg/config/static/metadata-1_34.yaml

@@ -34,8 +34,8 @@ images:
     kube-proxy:
         repo: proxy.replicated.com/library/kube-proxy
         tag:
-            amd64: v1.34.6-amd64@sha256:d15fdfdbbb53b76025a99346513f87d0fed7b8a35cc2dbad7d756e4cc335d28f
-            arm64: v1.34.6-arm64@sha256:e55fe5855f4fbeb26d34a9c172be0300eb30c089d60dcd1435652d970a4c3456
+            amd64: v1.34.6-amd64@sha256:e3e97a19a4fd9b69af36349aa5956aa54bfdf099f7db8cd83e190d1e3980b2f6
+            arm64: v1.34.6-arm64@sha256:c8c2f359f1d76310f61bd13f5ecdd640a9fcaea3a1ec2f5b0387b6225fce5bac
     metrics-server:
         repo: proxy.replicated.com/library/metrics-server
         tag:

scripts/k0s-update-dependencies.sh

@@ -48,16 +48,13 @@ function main() {
     # pin to the current major.minor version
     sed "${SED_ARGS[@]}" "s/^K0S_MINOR_VERSION ?= .*$/K0S_MINOR_VERSION ?= $minor_version/" versions.mk
 
-    # only update images and code if there has been a change to the versions.mk file
-    if ! git diff --exit-code --name-only versions.mk > /dev/null; then
-        # update images for all major.minor versions
-        UPDATE_ALL_IMAGES=true ./scripts/k0s-update-images.sh "$minor_version"
+    # always update images for all major.minor versions to pull in the latest cve0 patches
+    UPDATE_ALL_IMAGES=true ./scripts/k0s-update-images.sh "$minor_version"
 
-        # prepare the code for the current major.minor version
-        export K0S_MINOR_VERSION="$minor_version"
-        update_go_dependencies
-        generate_crd_manifests
-    fi
+    # prepare the code for the current major.minor version
+    export K0S_MINOR_VERSION="$minor_version"
+    update_go_dependencies
+    generate_crd_manifests
 
     echo "Done"
 }

versions.mk

@@ -18,10 +18,10 @@ K0S_VERSION = $(K0S_VERSION_1_$(K0S_MINOR_VERSION))
 K0S_GO_VERSION = $(K0S_VERSION_1_$(K0S_MINOR_VERSION))
 
 # Troubleshoot Version
-TROUBLESHOOT_VERSION = v0.125.1
+TROUBLESHOOT_VERSION = v0.126.0
 
 # Helm Version
-HELM_VERSION = v4.1.3
+HELM_VERSION = v4.1.4
 
 # FIO Version (for performance testing)
 FIO_VERSION = 3.42