github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy RemoveTaintOffNode logic to k8s.io/cloud-provider

Browse Source
This commit is contained in:
cici37
2020-04-28 11:10:16 -07:00
parent 68cbb35ebc
commit 32411016cc
5 changed files with 330 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/cloud/BUILD
View File

@@ -9,7 +9,6 @@ go_library(
importpath = "k8s.io/kubernetes/pkg/controller/cloud",
visibility = ["//visibility:public"],
deps = [
"//pkg/controller:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

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

@@ -38,7 +38,6 @@ import (
cloudproviderapi "k8s.io/cloud-provider/api"
cloudnodeutil "k8s.io/cloud-provider/node/helpers"
"k8s.io/klog"
"k8s.io/kubernetes/pkg/controller"
)
const (
@@ -140,7 +139,7 @@ func (c *CloudNodeLifecycleController) MonitorNodes() {
if status == v1.ConditionTrue {
// if taint exist remove taint
err = controller.RemoveTaintOffNode(c.kubeClient, node.Name, node, ShutdownTaint)
err = cloudnodeutil.RemoveTaintOffNode(c.kubeClient, node.Name, node, ShutdownTaint)
if err != nil {
klog.Errorf("error patching node taints: %v", err)
}
@@ -185,7 +184,7 @@ func (c *CloudNodeLifecycleController) MonitorNodes() {
if shutdown && err == nil {
// if node is shutdown add shutdown taint
err = controller.AddOrUpdateTaintOnNode(c.kubeClient, node.Name, ShutdownTaint)
err = cloudnodeutil.AddOrUpdateTaintOnNode(c.kubeClient, node.Name, ShutdownTaint)
if err != nil {
klog.Errorf("failed to apply shutdown taint to node %s, it may have been deleted.", node.Name)
}