github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages 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

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)