From 6658ceb68b2367a74161111f5d83a0ad83a2be41 Mon Sep 17 00:00:00 2001 From: Priyansh Choudhary Date: Mon, 23 Mar 2026 11:04:08 +0530 Subject: [PATCH] Update Dockerfile to use setup-envtest for downloading envtest binaries Signed-off-by: Priyansh Choudhary --- changelogs/unreleased/9581-shubham-pampattiwar | 1 - hack/build-image/Dockerfile | 9 +++++---- pkg/util/podvolume/pod_volume_test.go | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) delete mode 100644 changelogs/unreleased/9581-shubham-pampattiwar diff --git a/changelogs/unreleased/9581-shubham-pampattiwar b/changelogs/unreleased/9581-shubham-pampattiwar deleted file mode 100644 index f369a8af5..000000000 --- a/changelogs/unreleased/9581-shubham-pampattiwar +++ /dev/null @@ -1 +0,0 @@ -Fix DBR stuck when CSI snapshot no longer exists in cloud provider diff --git a/hack/build-image/Dockerfile b/hack/build-image/Dockerfile index 069398e5f..15c9f9ca8 100644 --- a/hack/build-image/Dockerfile +++ b/hack/build-image/Dockerfile @@ -21,10 +21,11 @@ ENV GO111MODULE=on ENV GOPROXY=${GOPROXY} # kubebuilder test bundle is separated from kubebuilder. Need to setup it for CI test. -RUN curl -sSLo envtest-bins.tar.gz https://go.kubebuilder.io/test-tools/1.22.1/linux/$(go env GOARCH) && \ - mkdir /usr/local/kubebuilder && \ - tar -C /usr/local/kubebuilder --strip-components=1 -zvxf envtest-bins.tar.gz - +# Using setup-envtest to download envtest binaries +RUN go install sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.19 && \ + mkdir -p /usr/local/kubebuilder/bin && \ + ENVTEST_ASSETS_DIR=$(setup-envtest use 1.24.2 --bin-dir /usr/local/kubebuilder/bin -p path) && \ + cp -r ${ENVTEST_ASSETS_DIR}/* /usr/local/kubebuilder/bin/ RUN wget --quiet https://github.com/kubernetes-sigs/kubebuilder/releases/download/v3.2.0/kubebuilder_linux_$(go env GOARCH) && \ mv kubebuilder_linux_$(go env GOARCH) /usr/local/kubebuilder/bin/kubebuilder && \ chmod +x /usr/local/kubebuilder/bin/kubebuilder diff --git a/pkg/util/podvolume/pod_volume_test.go b/pkg/util/podvolume/pod_volume_test.go index 9f6738a65..2bc9da86f 100644 --- a/pkg/util/podvolume/pod_volume_test.go +++ b/pkg/util/podvolume/pod_volume_test.go @@ -156,7 +156,7 @@ func TestGetVolumesByPod(t *testing.T) { Volumes: []corev1api.Volume{ // PVB Volumes {Name: "pvbPV1"}, {Name: "pvbPV2"}, {Name: "pvbPV3"}, - /// Excluded from PVB because colume mounting default service account token + /// Excluded from PVB because volume mounting default service account token {Name: "default-token-5xq45"}, }, },