github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 19:01:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69863 from stewart-yu/stewart-cloud-controller-manager-clean

Browse Source 
fix register wrong configz for *-controller-manager
This commit is contained in:
k8s-ci-robot 2018-11-08 04:06:43 -08:00 committed by GitHub
commit 1af76aee9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cloud-controller-manager/app/controllermanager.go
View File

@ -50,6 +50,8 @@ import (
const ( const (
// ControllerStartJitter is the jitter value used when starting controller managers. // ControllerStartJitter is the jitter value used when starting controller managers.
ControllerStartJitter = 1.0 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 // 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 // setup /configz endpoint
if cz, err := configz.New("componentconfig"); err == nil { if cz, err := configz.New(ConfigzName); err == nil {
cz.Set(c.ComponentConfig) cz.Set(c.ComponentConfig)
} else { } else {
glog.Errorf("unable to register configz: %c", err) glog.Errorf("unable to register configz: %c", err)

4
cmd/kube-controller-manager/app/controllermanager.go
View File

@ -64,6 +64,8 @@ import (
const ( const (
// Jitter used when starting controller managers // Jitter used when starting controller managers
ControllerStartJitter = 1.0 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 type ControllerLoopMode int
@ -142,7 +144,7 @@ func Run(c *config.CompletedConfig, stopCh <-chan struct{}) error {
// To help debugging, immediately log version // To help debugging, immediately log version
glog.Infof("Version: %+v", version.Get()) 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) cfgz.Set(c.ComponentConfig)
} else { } else {
glog.Errorf("unable to register configz: %c", err) glog.Errorf("unable to register configz: %c", err)