From a2942e5f9ca8acdf1090ec0f32cb0f4d2d2433e0 Mon Sep 17 00:00:00 2001 From: stewart-yu Date: Tue, 16 Oct 2018 17:55:16 +0800 Subject: [PATCH] fix register wrong configz for *-controller-manager --- cmd/cloud-controller-manager/app/controllermanager.go | 4 +++- cmd/kube-controller-manager/app/controllermanager.go | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/cloud-controller-manager/app/controllermanager.go b/cmd/cloud-controller-manager/app/controllermanager.go index d01600646f..6168e9ff3e 100644 --- a/cmd/cloud-controller-manager/app/controllermanager.go +++ b/cmd/cloud-controller-manager/app/controllermanager.go @@ -50,6 +50,8 @@ import ( const ( // ControllerStartJitter is the jitter value used when starting controller managers. ControllerStartJitter = 1.0 + // ConfigzName is the name used for register cloud-controller manager /configz, same with GroupName. + ConfigzName = "cloudcontrollermanager.config.k8s.io" ) // NewCloudControllerManagerCommand creates a *cobra.Command object with default parameters @@ -123,7 +125,7 @@ func Run(c *cloudcontrollerconfig.CompletedConfig, stopCh <-chan struct{}) error } // setup /configz endpoint - if cz, err := configz.New("componentconfig"); err == nil { + if cz, err := configz.New(ConfigzName); err == nil { cz.Set(c.ComponentConfig) } else { glog.Errorf("unable to register configz: %c", err) diff --git a/cmd/kube-controller-manager/app/controllermanager.go b/cmd/kube-controller-manager/app/controllermanager.go index 1dab046122..f193491ede 100644 --- a/cmd/kube-controller-manager/app/controllermanager.go +++ b/cmd/kube-controller-manager/app/controllermanager.go @@ -64,6 +64,8 @@ import ( const ( // Jitter used when starting controller managers ControllerStartJitter = 1.0 + // ConfigzName is the name used for register kube-controller manager /configz, same with GroupName. + ConfigzName = "kubecontrollermanager.config.k8s.io" ) type ControllerLoopMode int @@ -142,7 +144,7 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error { // To help debugging, immediately log version glog.Infof("Version: %+v", version.Get()) - if cfgz, err := configz.New("componentconfig"); err == nil { + if cfgz, err := configz.New(ConfigzName); err == nil { cfgz.Set(c.ComponentConfig) } else { glog.Errorf("unable to register configz: %c", err)