Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from Feb 26, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 5 additions & 9 deletions pkg/controller/cloud/BUILD
View file
Open in desktop
@@ -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",
Expand All @@ -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",
Expand All @@ -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",
],
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -76,4 +71,5 @@ filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
visibility = ["//visibility:public"],
)
6 changes: 3 additions & 3 deletions pkg/controller/cloud/node_controller.go
View file
Open in desktop
Expand Up @@ -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"
)

Expand Down Expand Up @@ -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
}
}
Expand All @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions pkg/controller/cloud/node_controller_test.go
View file
Open in desktop
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
},
Expand Down Expand Up @@ -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,
},
Expand Down Expand Up @@ -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,
},
Expand Down Expand Up @@ -503,7 +503,7 @@ func TestNodeAddresses(t *testing.T) {
Effect: v1.TaintEffectNoSchedule,
},
{
Key: schedulerapi.TaintExternalCloudProvider,
Key: cloudproviderapi.TaintExternalCloudProvider,
Value: "true",
Effect: v1.TaintEffectNoSchedule,
},
Expand Down Expand Up @@ -615,7 +615,7 @@ func TestNodeProvidedIPAddresses(t *testing.T) {
Effect: v1.TaintEffectNoSchedule,
},
{
Key: schedulerapi.TaintExternalCloudProvider,
Key: cloudproviderapi.TaintExternalCloudProvider,
Value: "true",
Effect: v1.TaintEffectNoSchedule,
},
Expand Down Expand Up @@ -1016,7 +1016,7 @@ func TestNodeProviderID(t *testing.T) {
Effect: v1.TaintEffectNoSchedule,
},
{
Key: schedulerapi.TaintExternalCloudProvider,
Key: cloudproviderapi.TaintExternalCloudProvider,
Value: "true",
Effect: v1.TaintEffectNoSchedule,
},
Expand Down Expand Up @@ -1099,7 +1099,7 @@ func TestNodeProviderIDAlreadySet(t *testing.T) {
Effect: v1.TaintEffectNoSchedule,
},
{
Key: schedulerapi.TaintExternalCloudProvider,
Key: cloudproviderapi.TaintExternalCloudProvider,
Value: "true",
Effect: v1.TaintEffectNoSchedule,
},
Expand Down Expand Up @@ -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,
},
Expand Down Expand Up @@ -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,
},
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/cloud/node_lifecycle_controller.go
View file
Open in desktop
Expand Up @@ -34,18 +34,18 @@ 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 (
deleteNodeEvent = "DeletingNode"
)

var ShutdownTaint = &v1.Taint{
Key: schedulerapi.TaintNodeShutdown,
Key: cloudproviderapi.TaintNodeShutdown,
Effect: v1.TaintEffectNoSchedule,
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/kubelet/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions pkg/kubelet/kubelet_node_status.go
View file
Open in desktop
Expand Up @@ -32,14 +32,14 @@ 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"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
"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"
Expand Down Expand Up @@ -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,
}
Expand Down
1 change: 0 additions & 1 deletion pkg/scheduler/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down
25 changes: 0 additions & 25 deletions pkg/scheduler/api/BUILD
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions staging/src/k8s.io/cloud-provider/BUILD
View file
Open in desktop
Expand Up @@ -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",
Expand Down
23 changes: 23 additions & 0 deletions staging/src/k8s.io/cloud-provider/api/BUILD
View file
Open in desktop
@@ -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"],
)
0 pkg/scheduler/api/well_known_labels.go → ...o/cloud-provider/api/well_known_taints.go
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions vendor/modules.txt
View file
Open in desktop
Expand Up @@ -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
Expand Down