Merge pull request #72764 from andrewsykim/cloud-node-lifecycle-controller-rbac

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 {

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,
 	)