From 60fe406f670b55f57476f874a9b3768e093f091b Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 6 Jun 2024 12:18:38 -0400 Subject: [PATCH] remove vestiges of providerless tag Signed-off-by: Davanum Srinivas --- hack/lib/init.sh | 7 ------- pkg/controller/nodeipam/node_ipam_controller.go | 3 +-- test/e2e/storage/volume_provisioning.go | 3 --- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/hack/lib/init.sh b/hack/lib/init.sh index 38ae52eb328..1122395122b 100755 --- a/hack/lib/init.sh +++ b/hack/lib/init.sh @@ -25,13 +25,6 @@ set -o pipefail # https://github.com/kubernetes/kubernetes/issues/52255 unset CDPATH -# FIXME(dims): Note that here we assume that if GOFLAGS are already set we -# leave them as-is and not try to add providerless to it. So if you -# really need to set your own GOFLAGS, ensure you add "providerless" explicitly -if [[ "${KUBE_PROVIDERLESS:-"n"}" == "y" ]]; then - export GOFLAGS=${GOFLAGS:-"-tags=providerless"} -fi - # The root of the build/dist directory KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)" diff --git a/pkg/controller/nodeipam/node_ipam_controller.go b/pkg/controller/nodeipam/node_ipam_controller.go index e254e97a47c..27b079839d0 100644 --- a/pkg/controller/nodeipam/node_ipam_controller.go +++ b/pkg/controller/nodeipam/node_ipam_controller.go @@ -34,8 +34,7 @@ import ( ) // ipamController is an interface abstracting an interface for -// legacy mode. It is needed to ensure correct building for -// both provider-specific and providerless environments. +// legacy mode. type ipamController interface { Run(ctx context.Context) } diff --git a/test/e2e/storage/volume_provisioning.go b/test/e2e/storage/volume_provisioning.go index fed0b93157a..bd77e0f76fd 100644 --- a/test/e2e/storage/volume_provisioning.go +++ b/test/e2e/storage/volume_provisioning.go @@ -1,6 +1,3 @@ -//go:build !providerless -// +build !providerless - /* Copyright 2016 The Kubernetes Authors.