mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 22:46:12 +00:00
Merge pull request #125365 from dims/remove-vestiges-of-providerless-tag
Remove vestiges of providerless tag
This commit is contained in:
commit
c707c43466
@ -25,13 +25,6 @@ set -o pipefail
|
|||||||
# https://github.com/kubernetes/kubernetes/issues/52255
|
# https://github.com/kubernetes/kubernetes/issues/52255
|
||||||
unset CDPATH
|
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
|
# The root of the build/dist directory
|
||||||
KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
|
KUBE_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd -P)"
|
||||||
|
|
||||||
|
@ -34,8 +34,7 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
// ipamController is an interface abstracting an interface for
|
// ipamController is an interface abstracting an interface for
|
||||||
// legacy mode. It is needed to ensure correct building for
|
// legacy mode.
|
||||||
// both provider-specific and providerless environments.
|
|
||||||
type ipamController interface {
|
type ipamController interface {
|
||||||
Run(ctx context.Context)
|
Run(ctx context.Context)
|
||||||
}
|
}
|
||||||
|
@ -1,6 +1,3 @@
|
|||||||
//go:build !providerless
|
|
||||||
// +build !providerless
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2016 The Kubernetes Authors.
|
Copyright 2016 The Kubernetes Authors.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user