github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62268 from max8899/master

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 61010, 61315, 62268). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix some shadow declaration in cmd package

**What this PR does / why we need it**:

There are some shadow declaration variables used in cmd package. 

Release note:
```
NONE
```


Signed-off-by: Lei Gong <lgong@alauda.io>
This commit is contained in:
Kubernetes Submit Queue 2018-04-09 04:31:17 -07:00 committed by GitHub
commit 1aa4dd04d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
cmd/kube-scheduler/app/server.go
View File

@ -482,38 +482,38 @@ func makeLeaderElectionConfig(config componentconfig.KubeSchedulerLeaderElection
// embed the metrics handler if the healthz and metrics address configurations // embed the metrics handler if the healthz and metrics address configurations
// are the same. // are the same.
func makeHealthzServer(config *componentconfig.KubeSchedulerConfiguration) *http.Server { func makeHealthzServer(config *componentconfig.KubeSchedulerConfiguration) *http.Server {
mux := mux.NewPathRecorderMux("kube-scheduler") pathRecorderMux := mux.NewPathRecorderMux("kube-scheduler")
healthz.InstallHandler(mux) healthz.InstallHandler(pathRecorderMux)
if config.HealthzBindAddress == config.MetricsBindAddress { if config.HealthzBindAddress == config.MetricsBindAddress {
configz.InstallHandler(mux) configz.InstallHandler(pathRecorderMux)
mux.Handle("/metrics", prometheus.Handler()) pathRecorderMux.Handle("/metrics", prometheus.Handler())
} }
if config.EnableProfiling { if config.EnableProfiling {
routes.Profiling{}.Install(mux) routes.Profiling{}.Install(pathRecorderMux)
if config.EnableContentionProfiling { if config.EnableContentionProfiling {
goruntime.SetBlockProfileRate(1) goruntime.SetBlockProfileRate(1)
} }
} }
return &http.Server{ return &http.Server{
Addr: config.HealthzBindAddress, Addr: config.HealthzBindAddress,
Handler: mux, Handler: pathRecorderMux,
} }
} }
// makeMetricsServer builds a metrics server from the config. // makeMetricsServer builds a metrics server from the config.
func makeMetricsServer(config *componentconfig.KubeSchedulerConfiguration) *http.Server { func makeMetricsServer(config *componentconfig.KubeSchedulerConfiguration) *http.Server {
mux := mux.NewPathRecorderMux("kube-scheduler") pathRecorderMux := mux.NewPathRecorderMux("kube-scheduler")
configz.InstallHandler(mux) configz.InstallHandler(pathRecorderMux)
mux.Handle("/metrics", prometheus.Handler()) pathRecorderMux.Handle("/metrics", prometheus.Handler())
if config.EnableProfiling { if config.EnableProfiling {
routes.Profiling{}.Install(mux) routes.Profiling{}.Install(pathRecorderMux)
if config.EnableContentionProfiling { if config.EnableContentionProfiling {
goruntime.SetBlockProfileRate(1) goruntime.SetBlockProfileRate(1)
} }
} }
return &http.Server{ return &http.Server{
Addr: config.MetricsBindAddress, Addr: config.MetricsBindAddress,
Handler: mux, Handler: pathRecorderMux,
} }
} }