From 426714c24569614f801f0d7900e0a81fae05b873 Mon Sep 17 00:00:00 2001 From: andrewsykim Date: Thu, 10 Jan 2019 19:44:33 -0500 Subject: [PATCH] use node-controller cluster role for node e-lifecycle and cloud-node-lifecycle controller --- cmd/cloud-controller-manager/app/controllermanager.go | 6 ++++-- cmd/kube-controller-manager/app/core.go | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index ebdb60f5cc..3f7909af90 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -225,7 +225,8 @@ func startControllers(c *cloudcontrollerconfig.CompletedConfig, stop <-chan stru // Start the CloudNodeController nodeController := cloudcontrollers.NewCloudNodeController( c.SharedInformers.Core().V1().Nodes(), - client("cloud-node-controller"), cloud, + // cloud node controller uses existing cluster role from node-controller + client("node-controller"), cloud, c.ComponentConfig.NodeStatusUpdateFrequency.Duration) go nodeController.Run(stop) @@ -233,7 +234,8 @@ func startControllers(c *cloudcontrollerconfig.CompletedConfig, stop <-chan stru cloudNodeLifecycleController, err := cloudcontrollers.NewCloudNodeLifecycleController( c.SharedInformers.Core().V1().Nodes(), - client("cloud-node-lifecycle-controller"), cloud, + // cloud node lifecycle controller uses existing cluster role from node-controller + client("node-controller"), cloud, c.ComponentConfig.KubeCloudShared.NodeMonitorPeriod.Duration, ) if err != nil { diff --git a/cmd/kube-controller-manager/app/core.go b/cmd/kube-controller-manager/app/core.go index 45f663b86b..421e046ea2 100644 --- a/cmd/kube-controller-manager/app/core.go +++ b/cmd/kube-controller-manager/app/core.go @@ -126,6 +126,7 @@ func startNodeLifecycleController(ctx ControllerContext) (http.Handler, bool, er ctx.InformerFactory.Core().V1().Pods(), ctx.InformerFactory.Core().V1().Nodes(), ctx.InformerFactory.Apps().V1().DaemonSets(), + // node lifecycle controller uses existing cluster role from node-controller ctx.ClientBuilder.ClientOrDie("node-controller"), ctx.ComponentConfig.KubeCloudShared.NodeMonitorPeriod.Duration, ctx.ComponentConfig.NodeLifecycleController.NodeStartupGracePeriod.Duration, @@ -149,7 +150,8 @@ func startNodeLifecycleController(ctx ControllerContext) (http.Handler, bool, er func startCloudNodeLifecycleController(ctx ControllerContext) (http.Handler, bool, error) { cloudNodeLifecycleController, err := cloudcontroller.NewCloudNodeLifecycleController( ctx.InformerFactory.Core().V1().Nodes(), - ctx.ClientBuilder.ClientOrDie("cloud-node-lifecycle-controller"), + // cloud node lifecycle controller uses existing cluster role from node-controller + ctx.ClientBuilder.ClientOrDie("node-controller"), ctx.Cloud, ctx.ComponentConfig.KubeCloudShared.NodeMonitorPeriod.Duration, )