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

Merge pull request #90561 from cici37/util

Browse Source 
Copy patchNodeStatus logic to cloud-provider
This commit is contained in:
Kubernetes Prow Robot
2020-05-04 13:46:43 -07:00
committed by GitHub
parent 03a927e756 b8bac0206d
commit e8d6d3768e
4 changed files with 143 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/controller/cloud/BUILD
View File

@@ -10,7 +10,6 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//pkg/controller: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",
"//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",

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

@@ -39,7 +39,6 @@ import (
cloudproviderapi "k8s.io/cloud-provider/api"
cloudnodeutil "k8s.io/cloud-provider/node/helpers"
"k8s.io/klog"
nodeutil "k8s.io/kubernetes/pkg/util/node"
)
// labelReconcileInfo lists Node labels to reconcile, and how to reconcile them.
@@ -280,7 +279,7 @@ func (cnc *CloudNodeController) updateNodeAddress(ctx context.Context, node *v1.
}
newNode := node.DeepCopy()
newNode.Status.Addresses = nodeAddresses
_, _, err = nodeutil.PatchNodeStatus(cnc.kubeClient.CoreV1(), types.NodeName(node.Name), node, newNode)
_, _, err = cloudnodeutil.PatchNodeStatus(cnc.kubeClient.CoreV1(), types.NodeName(node.Name), node, newNode)
if err != nil {
klog.Errorf("Error patching node with cloud ip addresses = [%v]", err)
}