Skip to content

K
k3s
Commit a10a2f0e authored by Piotr Szczesniak's avatar Piotr Szczesniak
Browse files
Options

Merge pull request #17387 from liggitt/metrics_https

Fix transposed controller manager args
parents 07989154 14c40fa7
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/kube-controller-manager/app/controllermanager.go
View file @ a10a2f0e
...@@ -342,7 +342,7 @@ func (s *CMServer) Run(_ []string) error { ...@@ -342,7 +342,7 @@ func (s *CMServer) Run(_ []string) error {
glog.Infof("Starting %s apis", groupVersion) glog.Infof("Starting %s apis", groupVersion)
if containsResource(resources, "horizontalpodautoscalers") { if containsResource(resources, "horizontalpodautoscalers") {
glog.Infof("Starting horizontal pod controller.") glog.Infof("Starting horizontal pod controller.")
metricsClient := metrics.NewHeapsterMetricsClient(kubeClient, metrics.DefaultHeapsterScheme, metrics.DefaultHeapsterNamespace, metrics.DefaultHeapsterPort, metrics.DefaultHeapsterService) metricsClient := metrics.NewHeapsterMetricsClient(kubeClient, metrics.DefaultHeapsterNamespace, metrics.DefaultHeapsterScheme, metrics.DefaultHeapsterService, metrics.DefaultHeapsterPort)
podautoscaler.NewHorizontalController(kubeClient, metricsClient). podautoscaler.NewHorizontalController(kubeClient, metricsClient).
Run(s.HorizontalPodAutoscalerSyncPeriod) Run(s.HorizontalPodAutoscalerSyncPeriod)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment