diff --git a/Dockerfile b/Dockerfile index c63011a18fa28..2bb5aa842084e 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:a61c057b4f69200ecf031519a20db79b8683837ba1dc2a59458d333eb75b174d #################################################################################################### # Builder image # Initial stage which pulls prepares build dependencies and CLI tooling we need for our final image 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 diff --git a/hack/tool-versions.sh b/hack/tool-versions.sh index 46914904ec6e0..f29d8eab47350 100644 --- a/hack/tool-versions.sh +++ b/hack/tool-versions.sh @@ -11,6 +11,6 @@ # 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.6.0 +helm3_version=3.19.0 +kustomize5_version=5.7.1 protoc_version=29.3 diff --git a/test/e2e/helm_test.go b/test/e2e/helm_test.go index 2e427a64b20be..1b8664cbd83e0 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.