github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #65981 from oracle/for/upstream/master/jah/reduce-log-spam 

Only attempt to register cloud nodes on update with the cloud taint
pull/564/head
Kubernetes Prow Robot 2019-01-26 06:20:28 -08:00 committed by GitHub
parent b5f2147a5a 9b3ab29cc9
commit 6cfd7beb86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,9 +22,7 @@ import (
"fmt" "fmt"
"time" "time"
"k8s.io/klog" v1 "k8s.io/api/core/v1"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
utilruntime "k8s.io/apimachinery/pkg/util/runtime" utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@ -37,6 +35,7 @@ import (
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
clientretry "k8s.io/client-go/util/retry" clientretry "k8s.io/client-go/util/retry"
cloudprovider "k8s.io/cloud-provider" cloudprovider "k8s.io/cloud-provider"
"k8s.io/klog"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis" kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
schedulerapi "k8s.io/kubernetes/pkg/scheduler/api" schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
nodeutil "k8s.io/kubernetes/pkg/util/node" nodeutil "k8s.io/kubernetes/pkg/util/node"
@ -199,14 +198,22 @@ func (cnc *CloudNodeController) updateNodeAddress(node *v1.Node, instances cloud
} }
func (cnc *CloudNodeController) UpdateCloudNode(_, newObj interface{}) { func (cnc *CloudNodeController) UpdateCloudNode(_, newObj interface{}) {
if _, ok := newObj.(*v1.Node); !ok { node, ok := newObj.(*v1.Node)
if !ok {
utilruntime.HandleError(fmt.Errorf("unexpected object type: %v", newObj)) utilruntime.HandleError(fmt.Errorf("unexpected object type: %v", newObj))
return return
} }
cnc.AddCloudNode(newObj)
cloudTaint := getCloudTaint(node.Spec.Taints)
if cloudTaint == nil {
// The node has already been initialized so nothing to do.
return
} }
// This processes nodes that were added into the cluster, and cloud initialize them if appropriate cnc.initializeNode(node)
}
// AddCloudNode handles initializing new nodes registered with the cloud taint.
func (cnc *CloudNodeController) AddCloudNode(obj interface{}) { func (cnc *CloudNodeController) AddCloudNode(obj interface{}) {
node := obj.(*v1.Node) node := obj.(*v1.Node)
@ -216,6 +223,12 @@ func (cnc *CloudNodeController) AddCloudNode(obj interface{}) {
return return
} }
cnc.initializeNode(node)
}
// This processes nodes that were added into the cluster, and cloud initialize them if appropriate
func (cnc *CloudNodeController) initializeNode(node *v1.Node) {
instances, ok := cnc.cloud.Instances() instances, ok := cnc.cloud.Instances()
if !ok { if !ok {
utilruntime.HandleError(fmt.Errorf("failed to get instances from cloud provider")) utilruntime.HandleError(fmt.Errorf("failed to get instances from cloud provider"))
@ -290,7 +303,7 @@ func (cnc *CloudNodeController) AddCloudNode(obj interface{}) {
} }
} }
curNode.Spec.Taints = excludeTaintFromList(curNode.Spec.Taints, *cloudTaint) curNode.Spec.Taints = excludeCloudTaint(curNode.Spec.Taints)
_, err = cnc.kubeClient.CoreV1().Nodes().Update(curNode) _, err = cnc.kubeClient.CoreV1().Nodes().Update(curNode)
if err != nil { if err != nil {
@ -318,10 +331,10 @@ func getCloudTaint(taints []v1.Taint) *v1.Taint {
return nil return nil
} }
func excludeTaintFromList(taints []v1.Taint, toExclude v1.Taint) []v1.Taint { func excludeCloudTaint(taints []v1.Taint) []v1.Taint {
newTaints := []v1.Taint{} newTaints := []v1.Taint{}
for _, taint := range taints { for _, taint := range taints {
if toExclude.MatchTaint(&taint) { if taint.Key == schedulerapi.TaintExternalCloudProvider {
continue continue
} }
newTaints = append(newTaints, taint) newTaints = append(newTaints, taint)