From 8c633356df9180d30adb8a335d3cd346057af9e5 Mon Sep 17 00:00:00 2001 From: andrewsykim Date: Sun, 23 Feb 2020 06:28:55 -0500 Subject: [PATCH] move well known cloud provider taints to k8s.io/cloud-provider/api Signed-off-by: andrewsykim --- pkg/controller/cloud/BUILD | 14 ++++------- pkg/controller/cloud/node_controller.go | 6 ++--- pkg/controller/cloud/node_controller_test.go | 20 +++++++-------- .../cloud/node_lifecycle_controller.go | 4 +-- pkg/kubelet/BUILD | 2 +- pkg/kubelet/kubelet_node_status.go | 4 +-- pkg/scheduler/BUILD | 1 - pkg/scheduler/api/BUILD | 25 ------------------- staging/src/k8s.io/cloud-provider/BUILD | 1 + staging/src/k8s.io/cloud-provider/api/BUILD | 23 +++++++++++++++++ .../cloud-provider/api/well_known_taints.go | 0 vendor/modules.txt | 1 + 12 files changed, 48 insertions(+), 53 deletions(-) delete mode 100644 pkg/scheduler/api/BUILD create mode 100644 staging/src/k8s.io/cloud-provider/api/BUILD rename pkg/scheduler/api/well_known_labels.go => staging/src/k8s.io/cloud-provider/api/well_known_taints.go (100%) diff --git a/pkg/controller/cloud/BUILD b/pkg/controller/cloud/BUILD index 2dbef978894..a8b9b5a5705 100644 --- a/pkg/controller/cloud/BUILD +++ b/pkg/controller/cloud/BUILD @@ -1,10 +1,4 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", - "go_test", -) +load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test") go_library( name = "go_default_library", @@ -13,10 +7,10 @@ go_library( "node_lifecycle_controller.go", ], importpath = "k8s.io/kubernetes/pkg/controller/cloud", + visibility = ["//visibility:public"], deps = [ "//pkg/controller:go_default_library", "//pkg/kubelet/apis:go_default_library", - "//pkg/scheduler/api:go_default_library", "//pkg/util/node:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library", @@ -34,6 +28,7 @@ go_library( "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/client-go/util/retry:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/cloud-provider/api:go_default_library", "//staging/src/k8s.io/cloud-provider/node/helpers:go_default_library", "//vendor/k8s.io/klog:go_default_library", ], @@ -49,7 +44,6 @@ go_test( deps = [ "//pkg/controller/testutil:go_default_library", "//pkg/kubelet/apis:go_default_library", - "//pkg/scheduler/api:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library", @@ -59,6 +53,7 @@ go_test( "//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library", "//staging/src/k8s.io/client-go/tools/record:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/cloud-provider/api:go_default_library", "//staging/src/k8s.io/cloud-provider/fake:go_default_library", "//vendor/github.com/stretchr/testify/assert:go_default_library", "//vendor/k8s.io/klog:go_default_library", @@ -76,4 +71,5 @@ filegroup( name = "all-srcs", srcs = [":package-srcs"], tags = ["automanaged"], + visibility = ["//visibility:public"], ) diff --git a/pkg/controller/cloud/node_controller.go b/pkg/controller/cloud/node_controller.go index e69a5318840..d8353e3c943 100644 --- a/pkg/controller/cloud/node_controller.go +++ b/pkg/controller/cloud/node_controller.go @@ -36,10 +36,10 @@ import ( "k8s.io/client-go/tools/record" clientretry "k8s.io/client-go/util/retry" cloudprovider "k8s.io/cloud-provider" + cloudproviderapi "k8s.io/cloud-provider/api" cloudnodeutil "k8s.io/cloud-provider/node/helpers" "k8s.io/klog" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" - schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" nodeutil "k8s.io/kubernetes/pkg/util/node" ) @@ -491,7 +491,7 @@ func (cnc *CloudNodeController) getNodeModifiersFromCloudProvider(ctx context.Co func getCloudTaint(taints []v1.Taint) *v1.Taint { for _, taint := range taints { - if taint.Key == schedulerapi.TaintExternalCloudProvider { + if taint.Key == cloudproviderapi.TaintExternalCloudProvider { return &taint } } @@ -501,7 +501,7 @@ func getCloudTaint(taints []v1.Taint) *v1.Taint { func excludeCloudTaint(taints []v1.Taint) []v1.Taint { newTaints := []v1.Taint{} for _, taint := range taints { - if taint.Key == schedulerapi.TaintExternalCloudProvider { + if taint.Key == cloudproviderapi.TaintExternalCloudProvider { continue } newTaints = append(newTaints, taint) diff --git a/pkg/controller/cloud/node_controller_test.go b/pkg/controller/cloud/node_controller_test.go index 9711a665338..9f030951dfe 100644 --- a/pkg/controller/cloud/node_controller_test.go +++ b/pkg/controller/cloud/node_controller_test.go @@ -33,10 +33,10 @@ import ( "k8s.io/client-go/informers" "k8s.io/client-go/tools/record" "k8s.io/cloud-provider" + cloudproviderapi "k8s.io/cloud-provider/api" fakecloud "k8s.io/cloud-provider/fake" "k8s.io/kubernetes/pkg/controller/testutil" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" - schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" "github.com/stretchr/testify/assert" "k8s.io/klog" @@ -187,7 +187,7 @@ func TestNodeInitialized(t *testing.T) { Spec: v1.NodeSpec{ Taints: []v1.Taint{ { - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, }, @@ -324,7 +324,7 @@ func TestGCECondition(t *testing.T) { Spec: v1.NodeSpec{ Taints: []v1.Taint{ { - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, }, @@ -409,7 +409,7 @@ func TestZoneInitialized(t *testing.T) { Spec: v1.NodeSpec{ Taints: []v1.Taint{ { - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, }, @@ -503,7 +503,7 @@ func TestNodeAddresses(t *testing.T) { Effect: v1.TaintEffectNoSchedule, }, { - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, }, @@ -615,7 +615,7 @@ func TestNodeProvidedIPAddresses(t *testing.T) { Effect: v1.TaintEffectNoSchedule, }, { - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, }, @@ -1016,7 +1016,7 @@ func TestNodeProviderID(t *testing.T) { Effect: v1.TaintEffectNoSchedule, }, { - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, }, @@ -1099,7 +1099,7 @@ func TestNodeProviderIDAlreadySet(t *testing.T) { Effect: v1.TaintEffectNoSchedule, }, { - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, }, @@ -1176,7 +1176,7 @@ func TestNodeProviderIDError(t *testing.T) { Spec: v1.NodeSpec{ Taints: []v1.Taint{ { - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, }, @@ -1264,7 +1264,7 @@ func TestNodeProviderIDNotImplemented(t *testing.T) { Spec: v1.NodeSpec{ Taints: []v1.Taint{ { - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, }, diff --git a/pkg/controller/cloud/node_lifecycle_controller.go b/pkg/controller/cloud/node_lifecycle_controller.go index ab0f07bad4a..8faea71617c 100644 --- a/pkg/controller/cloud/node_lifecycle_controller.go +++ b/pkg/controller/cloud/node_lifecycle_controller.go @@ -34,10 +34,10 @@ import ( v1lister "k8s.io/client-go/listers/core/v1" "k8s.io/client-go/tools/record" cloudprovider "k8s.io/cloud-provider" + cloudproviderapi "k8s.io/cloud-provider/api" cloudnodeutil "k8s.io/cloud-provider/node/helpers" "k8s.io/klog" "k8s.io/kubernetes/pkg/controller" - schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" ) const ( @@ -45,7 +45,7 @@ const ( ) var ShutdownTaint = &v1.Taint{ - Key: schedulerapi.TaintNodeShutdown, + Key: cloudproviderapi.TaintNodeShutdown, Effect: v1.TaintEffectNoSchedule, } diff --git a/pkg/kubelet/BUILD b/pkg/kubelet/BUILD index 02c938705a9..604034d8c75 100644 --- a/pkg/kubelet/BUILD +++ b/pkg/kubelet/BUILD @@ -96,7 +96,6 @@ go_library( "//pkg/kubelet/util/queue:go_default_library", "//pkg/kubelet/util/sliceutils:go_default_library", "//pkg/kubelet/volumemanager:go_default_library", - "//pkg/scheduler/api:go_default_library", "//pkg/security/apparmor:go_default_library", "//pkg/security/podsecuritypolicy/sysctl:go_default_library", "//pkg/util/iptables:go_default_library", @@ -139,6 +138,7 @@ go_library( "//staging/src/k8s.io/client-go/util/certificate:go_default_library", "//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library", "//staging/src/k8s.io/cloud-provider:go_default_library", + "//staging/src/k8s.io/cloud-provider/api:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis:go_default_library", "//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library", "//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library", diff --git a/pkg/kubelet/kubelet_node_status.go b/pkg/kubelet/kubelet_node_status.go index 28bf6a054ba..5f10945b041 100644 --- a/pkg/kubelet/kubelet_node_status.go +++ b/pkg/kubelet/kubelet_node_status.go @@ -32,6 +32,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" cloudprovider "k8s.io/cloud-provider" + cloudproviderapi "k8s.io/cloud-provider/api" "k8s.io/klog" k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" @@ -39,7 +40,6 @@ import ( "k8s.io/kubernetes/pkg/kubelet/events" "k8s.io/kubernetes/pkg/kubelet/nodestatus" "k8s.io/kubernetes/pkg/kubelet/util" - schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" nodeutil "k8s.io/kubernetes/pkg/util/node" taintutil "k8s.io/kubernetes/pkg/util/taints" volutil "k8s.io/kubernetes/pkg/volume/util" @@ -265,7 +265,7 @@ func (kl *Kubelet) initialNode(ctx context.Context) (*v1.Node, error) { if kl.externalCloudProvider { taint := v1.Taint{ - Key: schedulerapi.TaintExternalCloudProvider, + Key: cloudproviderapi.TaintExternalCloudProvider, Value: "true", Effect: v1.TaintEffectNoSchedule, } diff --git a/pkg/scheduler/BUILD b/pkg/scheduler/BUILD index 30553e6fa61..1fe5de8a0f8 100644 --- a/pkg/scheduler/BUILD +++ b/pkg/scheduler/BUILD @@ -117,7 +117,6 @@ filegroup( srcs = [ ":package-srcs", "//pkg/scheduler/algorithmprovider:all-srcs", - "//pkg/scheduler/api:all-srcs", "//pkg/scheduler/apis/config:all-srcs", "//pkg/scheduler/apis/extender/v1:all-srcs", "//pkg/scheduler/core:all-srcs", diff --git a/pkg/scheduler/api/BUILD b/pkg/scheduler/api/BUILD deleted file mode 100644 index d322950a866..00000000000 --- a/pkg/scheduler/api/BUILD +++ /dev/null @@ -1,25 +0,0 @@ -package(default_visibility = ["//visibility:public"]) - -load( - "@io_bazel_rules_go//go:def.bzl", - "go_library", -) - -go_library( - name = "go_default_library", - srcs = ["well_known_labels.go"], - importpath = "k8s.io/kubernetes/pkg/scheduler/api", -) - -filegroup( - name = "package-srcs", - srcs = glob(["**"]), - tags = ["automanaged"], - visibility = ["//visibility:private"], -) - -filegroup( - name = "all-srcs", - srcs = [":package-srcs"], - tags = ["automanaged"], -) diff --git a/staging/src/k8s.io/cloud-provider/BUILD b/staging/src/k8s.io/cloud-provider/BUILD index 9bb94000886..2d80c53923b 100644 --- a/staging/src/k8s.io/cloud-provider/BUILD +++ b/staging/src/k8s.io/cloud-provider/BUILD @@ -35,6 +35,7 @@ filegroup( name = "all-srcs", srcs = [ ":package-srcs", + "//staging/src/k8s.io/cloud-provider/api:all-srcs", "//staging/src/k8s.io/cloud-provider/fake:all-srcs", "//staging/src/k8s.io/cloud-provider/node:all-srcs", "//staging/src/k8s.io/cloud-provider/service/helpers:all-srcs", diff --git a/staging/src/k8s.io/cloud-provider/api/BUILD b/staging/src/k8s.io/cloud-provider/api/BUILD new file mode 100644 index 00000000000..263a9a8ee0a --- /dev/null +++ b/staging/src/k8s.io/cloud-provider/api/BUILD @@ -0,0 +1,23 @@ +load("@io_bazel_rules_go//go:def.bzl", "go_library") + +go_library( + name = "go_default_library", + srcs = ["well_known_taints.go"], + importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/api", + importpath = "k8s.io/cloud-provider/api", + visibility = ["//visibility:public"], +) + +filegroup( + name = "package-srcs", + srcs = glob(["**"]), + tags = ["automanaged"], + visibility = ["//visibility:private"], +) + +filegroup( + name = "all-srcs", + srcs = [":package-srcs"], + tags = ["automanaged"], + visibility = ["//visibility:public"], +) diff --git a/pkg/scheduler/api/well_known_labels.go b/staging/src/k8s.io/cloud-provider/api/well_known_taints.go similarity index 100% rename from pkg/scheduler/api/well_known_labels.go rename to staging/src/k8s.io/cloud-provider/api/well_known_taints.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 0ed78af569a..9d61e219d03 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1662,6 +1662,7 @@ k8s.io/client-go/util/testing k8s.io/client-go/util/workqueue # k8s.io/cloud-provider v0.0.0 => ./staging/src/k8s.io/cloud-provider k8s.io/cloud-provider +k8s.io/cloud-provider/api k8s.io/cloud-provider/fake k8s.io/cloud-provider/node/helpers k8s.io/cloud-provider/service/helpers