From e1f2706bdc421eb32104c0dc16a50d808441193a Mon Sep 17 00:00:00 2001 From: Patroklos Papapetrou Date: Mon, 15 Sep 2025 16:43:56 +0300 Subject: [PATCH 1/5] bumps ubuntu image version bumps kustomize and helm versions Signed-off-by: Patroklos Papapetrou --- Dockerfile | 2 +- hack/tool-versions.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index c87a7e2ffaef6..34e48c1d682a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=docker.io/library/ubuntu:25.04@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42 +ARG BASE_IMAGE=docker.io/library/ubuntu:25.10@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42 #################################################################################################### # Builder image # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image diff --git a/hack/tool-versions.sh b/hack/tool-versions.sh index 3be52847b500d..335a66ac95575 100644 --- a/hack/tool-versions.sh +++ b/hack/tool-versions.sh @@ -11,7 +11,7 @@ # Use ./hack/installers/checksums/add-helm-checksums.sh and # add-kustomize-checksums.sh to help download checksums. ############################################################################### -helm3_version=3.18.4 -kustomize5_version=5.7.0 +helm3_version=3.19.0 +kustomize5_version=5.7.1 protoc_version=29.3 oras_version=1.2.0 From 148de85bee8dbedf9fa0e4a00c7eba732cfa91f3 Mon Sep 17 00:00:00 2001 From: Patroklos Papapetrou Date: Mon, 15 Sep 2025 17:07:58 +0300 Subject: [PATCH 2/5] adds correct checksum of ubuntu image Signed-off-by: Patroklos Papapetrou --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 34e48c1d682a3..b8d09e9227f60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=docker.io/library/ubuntu:25.10@sha256:10bb10bb062de665d4dc3e0ea36715270ead632cfcb74d08ca2273712a0dfb42 +ARG BASE_IMAGE=docker.io/library/ubuntu:25.10@sha256:a61c057b4f69200ecf031519a20db79b8683837ba1dc2a59458d333eb75b174d #################################################################################################### # Builder image # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image From f3469f6e01fcd220274f587778ea97e41dfe9ce8 Mon Sep 17 00:00:00 2001 From: Patroklos Papapetrou Date: Mon, 15 Sep 2025 17:12:10 +0300 Subject: [PATCH 3/5] adds checksums for new helm and kustomize versions Signed-off-by: Patroklos Papapetrou --- hack/installers/checksums/helm-v-linux-amd64.tar.gz.sha256 | 0 .../installers/checksums/helm-v3.19.0-darwin-amd64.tar.gz.sha256 | 1 + .../installers/checksums/helm-v3.19.0-darwin-arm64.tar.gz.sha256 | 1 + hack/installers/checksums/helm-v3.19.0-linux-amd64.tar.gz.sha256 | 1 + hack/installers/checksums/helm-v3.19.0-linux-arm64.tar.gz.sha256 | 1 + .../checksums/helm-v3.19.0-linux-ppc64le.tar.gz.sha256 | 1 + hack/installers/checksums/helm-v3.19.0-linux-s390x.tar.gz.sha256 | 1 + .../checksums/kustomize_5.7.1_darwin_amd64.tar.gz.sha256 | 1 + .../checksums/kustomize_5.7.1_darwin_arm64.tar.gz.sha256 | 1 + .../checksums/kustomize_5.7.1_linux_amd64.tar.gz.sha256 | 1 + .../checksums/kustomize_5.7.1_linux_arm64.tar.gz.sha256 | 1 + .../checksums/kustomize_5.7.1_linux_ppc64le.tar.gz.sha256 | 1 + .../checksums/kustomize_5.7.1_linux_s390x.tar.gz.sha256 | 1 + 13 files changed, 12 insertions(+) create mode 100644 hack/installers/checksums/helm-v-linux-amd64.tar.gz.sha256 create mode 100644 hack/installers/checksums/helm-v3.19.0-darwin-amd64.tar.gz.sha256 create mode 100644 hack/installers/checksums/helm-v3.19.0-darwin-arm64.tar.gz.sha256 create mode 100644 hack/installers/checksums/helm-v3.19.0-linux-amd64.tar.gz.sha256 create mode 100644 hack/installers/checksums/helm-v3.19.0-linux-arm64.tar.gz.sha256 create mode 100644 hack/installers/checksums/helm-v3.19.0-linux-ppc64le.tar.gz.sha256 create mode 100644 hack/installers/checksums/helm-v3.19.0-linux-s390x.tar.gz.sha256 create mode 100644 hack/installers/checksums/kustomize_5.7.1_darwin_amd64.tar.gz.sha256 create mode 100644 hack/installers/checksums/kustomize_5.7.1_darwin_arm64.tar.gz.sha256 create mode 100644 hack/installers/checksums/kustomize_5.7.1_linux_amd64.tar.gz.sha256 create mode 100644 hack/installers/checksums/kustomize_5.7.1_linux_arm64.tar.gz.sha256 create mode 100644 hack/installers/checksums/kustomize_5.7.1_linux_ppc64le.tar.gz.sha256 create mode 100644 hack/installers/checksums/kustomize_5.7.1_linux_s390x.tar.gz.sha256 diff --git a/hack/installers/checksums/helm-v-linux-amd64.tar.gz.sha256 b/hack/installers/checksums/helm-v-linux-amd64.tar.gz.sha256 new file mode 100644 index 0000000000000..e69de29bb2d1d diff --git a/hack/installers/checksums/helm-v3.19.0-darwin-amd64.tar.gz.sha256 b/hack/installers/checksums/helm-v3.19.0-darwin-amd64.tar.gz.sha256 new file mode 100644 index 0000000000000..1d55fb0257935 --- /dev/null +++ b/hack/installers/checksums/helm-v3.19.0-darwin-amd64.tar.gz.sha256 @@ -0,0 +1 @@ +09a108c0abda42e45af172be65c49125354bf7cd178dbe10435e94540e49c7b9 helm-v3.19.0-darwin-amd64.tar.gz diff --git a/hack/installers/checksums/helm-v3.19.0-darwin-arm64.tar.gz.sha256 b/hack/installers/checksums/helm-v3.19.0-darwin-arm64.tar.gz.sha256 new file mode 100644 index 0000000000000..1e25a857cd9f0 --- /dev/null +++ b/hack/installers/checksums/helm-v3.19.0-darwin-arm64.tar.gz.sha256 @@ -0,0 +1 @@ +31513e1193da4eb4ae042eb5f98ef9aca7890cfa136f4707c8d4f70e2115bef6 helm-v3.19.0-darwin-arm64.tar.gz diff --git a/hack/installers/checksums/helm-v3.19.0-linux-amd64.tar.gz.sha256 b/hack/installers/checksums/helm-v3.19.0-linux-amd64.tar.gz.sha256 new file mode 100644 index 0000000000000..e079857875c82 --- /dev/null +++ b/hack/installers/checksums/helm-v3.19.0-linux-amd64.tar.gz.sha256 @@ -0,0 +1 @@ +a7f81ce08007091b86d8bd696eb4d86b8d0f2e1b9f6c714be62f82f96a594496 helm-v3.19.0-linux-amd64.tar.gz diff --git a/hack/installers/checksums/helm-v3.19.0-linux-arm64.tar.gz.sha256 b/hack/installers/checksums/helm-v3.19.0-linux-arm64.tar.gz.sha256 new file mode 100644 index 0000000000000..f75a0a56e84ff --- /dev/null +++ b/hack/installers/checksums/helm-v3.19.0-linux-arm64.tar.gz.sha256 @@ -0,0 +1 @@ +440cf7add0aee27ebc93fada965523c1dc2e0ab340d4348da2215737fc0d76ad helm-v3.19.0-linux-arm64.tar.gz diff --git a/hack/installers/checksums/helm-v3.19.0-linux-ppc64le.tar.gz.sha256 b/hack/installers/checksums/helm-v3.19.0-linux-ppc64le.tar.gz.sha256 new file mode 100644 index 0000000000000..0c61c321f6304 --- /dev/null +++ b/hack/installers/checksums/helm-v3.19.0-linux-ppc64le.tar.gz.sha256 @@ -0,0 +1 @@ +f57ea04d7fa62cc3e90a831eb67edb1400c810df6083875bee3a7c195a795ce4 helm-v3.19.0-linux-ppc64le.tar.gz diff --git a/hack/installers/checksums/helm-v3.19.0-linux-s390x.tar.gz.sha256 b/hack/installers/checksums/helm-v3.19.0-linux-s390x.tar.gz.sha256 new file mode 100644 index 0000000000000..3cb82d9433a20 --- /dev/null +++ b/hack/installers/checksums/helm-v3.19.0-linux-s390x.tar.gz.sha256 @@ -0,0 +1 @@ +0dff2f249f71690e3b420ebb5efc573eb26a51b4a614c4391c8c7fa3e47863f2 helm-v3.19.0-linux-s390x.tar.gz diff --git a/hack/installers/checksums/kustomize_5.7.1_darwin_amd64.tar.gz.sha256 b/hack/installers/checksums/kustomize_5.7.1_darwin_amd64.tar.gz.sha256 new file mode 100644 index 0000000000000..cffae013e4a83 --- /dev/null +++ b/hack/installers/checksums/kustomize_5.7.1_darwin_amd64.tar.gz.sha256 @@ -0,0 +1 @@ +4a0dff80c5644df6bc8f51b342842969004cb6ba5f94dddaabbea7483493273d kustomize_5.7.1_darwin_amd64.tar.gz diff --git a/hack/installers/checksums/kustomize_5.7.1_darwin_arm64.tar.gz.sha256 b/hack/installers/checksums/kustomize_5.7.1_darwin_arm64.tar.gz.sha256 new file mode 100644 index 0000000000000..060f0eee3cc43 --- /dev/null +++ b/hack/installers/checksums/kustomize_5.7.1_darwin_arm64.tar.gz.sha256 @@ -0,0 +1 @@ +073e9d16d5a235e2ff83e62d6b76edb5d962adbc33be1e4860c4b3f1f39b33b9 kustomize_5.7.1_darwin_arm64.tar.gz diff --git a/hack/installers/checksums/kustomize_5.7.1_linux_amd64.tar.gz.sha256 b/hack/installers/checksums/kustomize_5.7.1_linux_amd64.tar.gz.sha256 new file mode 100644 index 0000000000000..713b2a6ede6c5 --- /dev/null +++ b/hack/installers/checksums/kustomize_5.7.1_linux_amd64.tar.gz.sha256 @@ -0,0 +1 @@ +ea375e7372f9aa029129d4b2d16c66b7750b7f1213c4f66f910d981c895818d8 kustomize_5.7.1_linux_amd64.tar.gz diff --git a/hack/installers/checksums/kustomize_5.7.1_linux_arm64.tar.gz.sha256 b/hack/installers/checksums/kustomize_5.7.1_linux_arm64.tar.gz.sha256 new file mode 100644 index 0000000000000..de4d760156a80 --- /dev/null +++ b/hack/installers/checksums/kustomize_5.7.1_linux_arm64.tar.gz.sha256 @@ -0,0 +1 @@ +4261a040217df3bd6896597c3986d1465925726e4f22a945304b5233a4dcdbda kustomize_5.7.1_linux_arm64.tar.gz diff --git a/hack/installers/checksums/kustomize_5.7.1_linux_ppc64le.tar.gz.sha256 b/hack/installers/checksums/kustomize_5.7.1_linux_ppc64le.tar.gz.sha256 new file mode 100644 index 0000000000000..1a9cfc07f985b --- /dev/null +++ b/hack/installers/checksums/kustomize_5.7.1_linux_ppc64le.tar.gz.sha256 @@ -0,0 +1 @@ +56b6fbf549080b14ddc738f10a05f78cbc5511cd7ab2014d9eb85f52bb4b7263 kustomize_5.7.1_linux_ppc64le.tar.gz diff --git a/hack/installers/checksums/kustomize_5.7.1_linux_s390x.tar.gz.sha256 b/hack/installers/checksums/kustomize_5.7.1_linux_s390x.tar.gz.sha256 new file mode 100644 index 0000000000000..9a50df6903819 --- /dev/null +++ b/hack/installers/checksums/kustomize_5.7.1_linux_s390x.tar.gz.sha256 @@ -0,0 +1 @@ +b1eee427af74f3bb53d96e3ba94d5cc7484a35bb1af1495488bc684d60df4488 kustomize_5.7.1_linux_s390x.tar.gz From edac9dabd9fc5498996c00628cb42e14c3c0d743 Mon Sep 17 00:00:00 2001 From: Patroklos Papapetrou Date: Mon, 10 Nov 2025 16:33:26 +0200 Subject: [PATCH 4/5] update affected UTs --- util/helm/helm_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/helm/helm_test.go b/util/helm/helm_test.go index 137a0509d54b5..786335216ca97 100644 --- a/util/helm/helm_test.go +++ b/util/helm/helm_test.go @@ -236,7 +236,7 @@ func TestKubeVersionWithSymbol(t *testing.T) { err := runtime.DefaultUnstructuredConverter.FromUnstructured(obj.Object, &configMap) require.NoError(t, err) if data, ok := configMap.Data["kubeVersion"]; ok { - assert.Equal(t, "v1.30.11+IKS", data) + assert.Equal(t, "v1.30.11", data) return } t.Fatal("expected kubeVersion key not found in configMap") From d3fe296ab5ff394070d814cec7cc7f79ca2fe08b Mon Sep 17 00:00:00 2001 From: Patroklos Papapetrou Date: Tue, 11 Nov 2025 10:05:43 +0200 Subject: [PATCH 5/5] updates UTs --- test/e2e/helm_test.go | 2 +- test/e2e/kustomize_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/helm_test.go b/test/e2e/helm_test.go index a492369cd30a1..181baa45b62cf 100644 --- a/test/e2e/helm_test.go +++ b/test/e2e/helm_test.go @@ -355,7 +355,7 @@ func TestKubeVersion(t *testing.T) { kubeVersion := errors.NewHandler(t).FailOnErr(fixture.Run(".", "kubectl", "-n", fixture.DeploymentNamespace(), "get", "cm", "my-map", "-o", "jsonpath={.data.kubeVersion}")).(string) // Capabilities.KubeVersion defaults to 1.9.0, we assume here you are running a later version - assert.LessOrEqual(t, fixture.GetVersions(t).ServerVersion.Format("v%s.%s.0"), kubeVersion) + assert.LessOrEqual(t, fixture.GetVersions(t).ServerVersion.Format("v%s.%s"), kubeVersion) }). When(). // Make sure override works. diff --git a/test/e2e/kustomize_test.go b/test/e2e/kustomize_test.go index 60061ca9f6057..9829b6b33f775 100644 --- a/test/e2e/kustomize_test.go +++ b/test/e2e/kustomize_test.go @@ -305,7 +305,7 @@ func TestKustomizeKubeVersion(t *testing.T) { kubeVersion := errors.NewHandler(t).FailOnErr(fixture.Run(".", "kubectl", "-n", fixture.DeploymentNamespace(), "get", "cm", "my-map", "-o", "jsonpath={.data.kubeVersion}")).(string) // Capabilities.KubeVersion defaults to 1.9.0, we assume here you are running a later version - assert.LessOrEqual(t, fixture.GetVersions(t).ServerVersion.Format("v%s.%s.0"), kubeVersion) + assert.LessOrEqual(t, fixture.GetVersions(t).ServerVersion.Format("v%s.%s"), kubeVersion) }). When(). // Make sure override works.