github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

move well known cloud provider taints to k8s.io/cloud-provider/api

Browse Source 
Signed-off-by: andrewsykim <kim.andrewsy@gmail.com>
This commit is contained in:
andrewsykim
2020-02-23 06:28:55 -05:00
parent 9c1543263b
commit 8c633356df
12 changed files with 48 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/controller/cloud/BUILD
View File

@@ -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"],
)

6
pkg/controller/cloud/node_controller.go
View File

@@ -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)

20
pkg/controller/cloud/node_controller_test.go
View File

@@ -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,
},

4
pkg/controller/cloud/node_lifecycle_controller.go
View File

@@ -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,
}