Skip to content

Commit 8c63335

Browse files
andrewsykimandrewsykim
committed
move well known cloud provider taints to k8s.io/cloud-provider/api
Signed-off-by: andrewsykim <[email protected]>
1 parent 9c15432 commit 8c63335

File tree

12 files changed

+48
-53
lines changed

12 files changed

+48
-53
lines changed

‎pkg/controller/cloud/BUILD‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
package(default_visibility = ["//visibility:public"])
2-
3-
load(
4-
"@io_bazel_rules_go//go:def.bzl",
5-
"go_library",
6-
"go_test",
7-
)
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
82

93
go_library(
104
name = "go_default_library",
@@ -13,10 +7,10 @@ go_library(
137
"node_lifecycle_controller.go",
148
],
159
importpath = "k8s.io/kubernetes/pkg/controller/cloud",
10+
visibility = ["//visibility:public"],
1611
deps = [
1712
"//pkg/controller:go_default_library",
1813
"//pkg/kubelet/apis:go_default_library",
19-
"//pkg/scheduler/api:go_default_library",
2014
"//pkg/util/node:go_default_library",
2115
"//staging/src/k8s.io/api/core/v1:go_default_library",
2216
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
@@ -34,6 +28,7 @@ go_library(
3428
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
3529
"//staging/src/k8s.io/client-go/util/retry:go_default_library",
3630
"//staging/src/k8s.io/cloud-provider:go_default_library",
31+
"//staging/src/k8s.io/cloud-provider/api:go_default_library",
3732
"//staging/src/k8s.io/cloud-provider/node/helpers:go_default_library",
3833
"//vendor/k8s.io/klog:go_default_library",
3934
],
@@ -49,7 +44,6 @@ go_test(
4944
deps = [
5045
"//pkg/controller/testutil:go_default_library",
5146
"//pkg/kubelet/apis:go_default_library",
52-
"//pkg/scheduler/api:go_default_library",
5347
"//staging/src/k8s.io/api/core/v1:go_default_library",
5448
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
5549
"//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
@@ -59,6 +53,7 @@ go_test(
5953
"//staging/src/k8s.io/client-go/kubernetes/scheme:go_default_library",
6054
"//staging/src/k8s.io/client-go/tools/record:go_default_library",
6155
"//staging/src/k8s.io/cloud-provider:go_default_library",
56+
"//staging/src/k8s.io/cloud-provider/api:go_default_library",
6257
"//staging/src/k8s.io/cloud-provider/fake:go_default_library",
6358
"//vendor/github.com/stretchr/testify/assert:go_default_library",
6459
"//vendor/k8s.io/klog:go_default_library",
@@ -76,4 +71,5 @@ filegroup(
7671
name = "all-srcs",
7772
srcs = [":package-srcs"],
7873
tags = ["automanaged"],
74+
visibility = ["//visibility:public"],
7975
)

‎pkg/controller/cloud/node_controller.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ import (
3636
"k8s.io/client-go/tools/record"
3737
clientretry "k8s.io/client-go/util/retry"
3838
cloudprovider "k8s.io/cloud-provider"
39+
cloudproviderapi "k8s.io/cloud-provider/api"
3940
cloudnodeutil "k8s.io/cloud-provider/node/helpers"
4041
"k8s.io/klog"
4142
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
42-
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
4343
nodeutil "k8s.io/kubernetes/pkg/util/node"
4444
)
4545

@@ -491,7 +491,7 @@ func (cnc *CloudNodeController) getNodeModifiersFromCloudProvider(ctx context.Co
491491

492492
func getCloudTaint(taints []v1.Taint) *v1.Taint {
493493
for _, taint := range taints {
494-
if taint.Key == schedulerapi.TaintExternalCloudProvider {
494+
if taint.Key == cloudproviderapi.TaintExternalCloudProvider {
495495
return &taint
496496
}
497497
}
@@ -501,7 +501,7 @@ func getCloudTaint(taints []v1.Taint) *v1.Taint {
501501
func excludeCloudTaint(taints []v1.Taint) []v1.Taint {
502502
newTaints := []v1.Taint{}
503503
for _, taint := range taints {
504-
if taint.Key == schedulerapi.TaintExternalCloudProvider {
504+
if taint.Key == cloudproviderapi.TaintExternalCloudProvider {
505505
continue
506506
}
507507
newTaints = append(newTaints, taint)

‎pkg/controller/cloud/node_controller_test.go‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ import (
3333
"k8s.io/client-go/informers"
3434
"k8s.io/client-go/tools/record"
3535
"k8s.io/cloud-provider"
36+
cloudproviderapi "k8s.io/cloud-provider/api"
3637
fakecloud "k8s.io/cloud-provider/fake"
3738
"k8s.io/kubernetes/pkg/controller/testutil"
3839
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
39-
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
4040

4141
"github.com/stretchr/testify/assert"
4242
"k8s.io/klog"
@@ -187,7 +187,7 @@ func TestNodeInitialized(t *testing.T) {
187187
Spec: v1.NodeSpec{
188188
Taints: []v1.Taint{
189189
{
190-
Key: schedulerapi.TaintExternalCloudProvider,
190+
Key: cloudproviderapi.TaintExternalCloudProvider,
191191
Value: "true",
192192
Effect: v1.TaintEffectNoSchedule,
193193
},
@@ -324,7 +324,7 @@ func TestGCECondition(t *testing.T) {
324324
Spec: v1.NodeSpec{
325325
Taints: []v1.Taint{
326326
{
327-
Key: schedulerapi.TaintExternalCloudProvider,
327+
Key: cloudproviderapi.TaintExternalCloudProvider,
328328
Value: "true",
329329
Effect: v1.TaintEffectNoSchedule,
330330
},
@@ -409,7 +409,7 @@ func TestZoneInitialized(t *testing.T) {
409409
Spec: v1.NodeSpec{
410410
Taints: []v1.Taint{
411411
{
412-
Key: schedulerapi.TaintExternalCloudProvider,
412+
Key: cloudproviderapi.TaintExternalCloudProvider,
413413
Value: "true",
414414
Effect: v1.TaintEffectNoSchedule,
415415
},
@@ -503,7 +503,7 @@ func TestNodeAddresses(t *testing.T) {
503503
Effect: v1.TaintEffectNoSchedule,
504504
},
505505
{
506-
Key: schedulerapi.TaintExternalCloudProvider,
506+
Key: cloudproviderapi.TaintExternalCloudProvider,
507507
Value: "true",
508508
Effect: v1.TaintEffectNoSchedule,
509509
},
@@ -615,7 +615,7 @@ func TestNodeProvidedIPAddresses(t *testing.T) {
615615
Effect: v1.TaintEffectNoSchedule,
616616
},
617617
{
618-
Key: schedulerapi.TaintExternalCloudProvider,
618+
Key: cloudproviderapi.TaintExternalCloudProvider,
619619
Value: "true",
620620
Effect: v1.TaintEffectNoSchedule,
621621
},
@@ -1016,7 +1016,7 @@ func TestNodeProviderID(t *testing.T) {
10161016
Effect: v1.TaintEffectNoSchedule,
10171017
},
10181018
{
1019-
Key: schedulerapi.TaintExternalCloudProvider,
1019+
Key: cloudproviderapi.TaintExternalCloudProvider,
10201020
Value: "true",
10211021
Effect: v1.TaintEffectNoSchedule,
10221022
},
@@ -1099,7 +1099,7 @@ func TestNodeProviderIDAlreadySet(t *testing.T) {
10991099
Effect: v1.TaintEffectNoSchedule,
11001100
},
11011101
{
1102-
Key: schedulerapi.TaintExternalCloudProvider,
1102+
Key: cloudproviderapi.TaintExternalCloudProvider,
11031103
Value: "true",
11041104
Effect: v1.TaintEffectNoSchedule,
11051105
},
@@ -1176,7 +1176,7 @@ func TestNodeProviderIDError(t *testing.T) {
11761176
Spec: v1.NodeSpec{
11771177
Taints: []v1.Taint{
11781178
{
1179-
Key: schedulerapi.TaintExternalCloudProvider,
1179+
Key: cloudproviderapi.TaintExternalCloudProvider,
11801180
Value: "true",
11811181
Effect: v1.TaintEffectNoSchedule,
11821182
},
@@ -1264,7 +1264,7 @@ func TestNodeProviderIDNotImplemented(t *testing.T) {
12641264
Spec: v1.NodeSpec{
12651265
Taints: []v1.Taint{
12661266
{
1267-
Key: schedulerapi.TaintExternalCloudProvider,
1267+
Key: cloudproviderapi.TaintExternalCloudProvider,
12681268
Value: "true",
12691269
Effect: v1.TaintEffectNoSchedule,
12701270
},

‎pkg/controller/cloud/node_lifecycle_controller.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,18 @@ import (
3434
v1lister "k8s.io/client-go/listers/core/v1"
3535
"k8s.io/client-go/tools/record"
3636
cloudprovider "k8s.io/cloud-provider"
37+
cloudproviderapi "k8s.io/cloud-provider/api"
3738
cloudnodeutil "k8s.io/cloud-provider/node/helpers"
3839
"k8s.io/klog"
3940
"k8s.io/kubernetes/pkg/controller"
40-
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
4141
)
4242

4343
const (
4444
deleteNodeEvent = "DeletingNode"
4545
)
4646

4747
var ShutdownTaint = &v1.Taint{
48-
Key: schedulerapi.TaintNodeShutdown,
48+
Key: cloudproviderapi.TaintNodeShutdown,
4949
Effect: v1.TaintEffectNoSchedule,
5050
}
5151

‎pkg/kubelet/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ go_library(
9696
"//pkg/kubelet/util/queue:go_default_library",
9797
"//pkg/kubelet/util/sliceutils:go_default_library",
9898
"//pkg/kubelet/volumemanager:go_default_library",
99-
"//pkg/scheduler/api:go_default_library",
10099
"//pkg/security/apparmor:go_default_library",
101100
"//pkg/security/podsecuritypolicy/sysctl:go_default_library",
102101
"//pkg/util/iptables:go_default_library",
@@ -139,6 +138,7 @@ go_library(
139138
"//staging/src/k8s.io/client-go/util/certificate:go_default_library",
140139
"//staging/src/k8s.io/client-go/util/flowcontrol:go_default_library",
141140
"//staging/src/k8s.io/cloud-provider:go_default_library",
141+
"//staging/src/k8s.io/cloud-provider/api:go_default_library",
142142
"//staging/src/k8s.io/cri-api/pkg/apis:go_default_library",
143143
"//staging/src/k8s.io/cri-api/pkg/apis/runtime/v1alpha2:go_default_library",
144144
"//staging/src/k8s.io/kubelet/pkg/apis/pluginregistration/v1:go_default_library",

‎pkg/kubelet/kubelet_node_status.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ import (
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/types"
3434
cloudprovider "k8s.io/cloud-provider"
35+
cloudproviderapi "k8s.io/cloud-provider/api"
3536
"k8s.io/klog"
3637
k8s_api_v1 "k8s.io/kubernetes/pkg/apis/core/v1"
3738
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
3839
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
3940
"k8s.io/kubernetes/pkg/kubelet/events"
4041
"k8s.io/kubernetes/pkg/kubelet/nodestatus"
4142
"k8s.io/kubernetes/pkg/kubelet/util"
42-
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
4343
nodeutil "k8s.io/kubernetes/pkg/util/node"
4444
taintutil "k8s.io/kubernetes/pkg/util/taints"
4545
volutil "k8s.io/kubernetes/pkg/volume/util"
@@ -265,7 +265,7 @@ func (kl *Kubelet) initialNode(ctx context.Context) (*v1.Node, error) {
265265

266266
if kl.externalCloudProvider {
267267
taint := v1.Taint{
268-
Key: schedulerapi.TaintExternalCloudProvider,
268+
Key: cloudproviderapi.TaintExternalCloudProvider,
269269
Value: "true",
270270
Effect: v1.TaintEffectNoSchedule,
271271
}

‎pkg/scheduler/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ filegroup(
117117
srcs = [
118118
":package-srcs",
119119
"//pkg/scheduler/algorithmprovider:all-srcs",
120-
"//pkg/scheduler/api:all-srcs",
121120
"//pkg/scheduler/apis/config:all-srcs",
122121
"//pkg/scheduler/apis/extender/v1:all-srcs",
123122
"//pkg/scheduler/core:all-srcs",

‎pkg/scheduler/api/BUILD‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎staging/src/k8s.io/cloud-provider/BUILD‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ filegroup(
3535
name = "all-srcs",
3636
srcs = [
3737
":package-srcs",
38+
"//staging/src/k8s.io/cloud-provider/api:all-srcs",
3839
"//staging/src/k8s.io/cloud-provider/fake:all-srcs",
3940
"//staging/src/k8s.io/cloud-provider/node:all-srcs",
4041
"//staging/src/k8s.io/cloud-provider/service/helpers:all-srcs",

‎staging/src/k8s.io/cloud-provider/api/BUILD‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
load("@io_bazel_rules_go//go:def.bzl", "go_library")
2+
3+
go_library(
4+
name = "go_default_library",
5+
srcs = ["well_known_taints.go"],
6+
importmap = "k8s.io/kubernetes/vendor/k8s.io/cloud-provider/api",
7+
importpath = "k8s.io/cloud-provider/api",
8+
visibility = ["//visibility:public"],
9+
)
10+
11+
filegroup(
12+
name = "package-srcs",
13+
srcs = glob(["**"]),
14+
tags = ["automanaged"],
15+
visibility = ["//visibility:private"],
16+
)
17+
18+
filegroup(
19+
name = "all-srcs",
20+
srcs = [":package-srcs"],
21+
tags = ["automanaged"],
22+
visibility = ["//visibility:public"],
23+
)

0 commit comments

Comments
 (0)