d6fe1e8764
This commit switches over the HPA controller to use the custom metrics API. It also converts the HPA controller to use the generated client in k8s.io/metrics for the resource metrics API. In order to enable support, you must enable `--horizontal-pod-autoscaler-use-rest-clients` on the controller-manager, which will switch the HPA controller's MetricsClient implementation over to use the standard rest clients for both custom metrics and resource metrics. This requires that at the least resource metrics API is registered with kube-aggregator, and that the controller manager is pointed at kube-aggregator. For this to work, Heapster must be serving the new-style API server (`--api-server=true`).
82 lines
3.0 KiB
Go
82 lines
3.0 KiB
Go
/*
|
|
Copyright 2016 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
// Package app implements a server that runs a set of active
|
|
// components. This includes replication controllers, service endpoints and
|
|
// nodes.
|
|
//
|
|
package app
|
|
|
|
import (
|
|
"k8s.io/apimachinery/pkg/runtime/schema"
|
|
"k8s.io/kubernetes/pkg/controller/podautoscaler"
|
|
"k8s.io/kubernetes/pkg/controller/podautoscaler/metrics"
|
|
resourceclient "k8s.io/metrics/pkg/client/clientset_generated/clientset/typed/metrics/v1alpha1"
|
|
"k8s.io/metrics/pkg/client/custom_metrics"
|
|
|
|
// install the APIs so that they're registered with the scheme for the clients
|
|
_ "k8s.io/metrics/pkg/apis/custom_metrics/install"
|
|
_ "k8s.io/metrics/pkg/apis/metrics/install"
|
|
)
|
|
|
|
func startHPAController(ctx ControllerContext) (bool, error) {
|
|
if !ctx.AvailableResources[schema.GroupVersionResource{Group: "autoscaling", Version: "v1", Resource: "horizontalpodautoscalers"}] {
|
|
return false, nil
|
|
}
|
|
|
|
if ctx.Options.HorizontalPodAutoscalerUseRESTClients {
|
|
// use the new-style clients if support for custom metrics is enabled
|
|
return startHPAControllerWithRESTClient(ctx)
|
|
}
|
|
|
|
return startHPAControllerWithLegacyClient(ctx)
|
|
}
|
|
|
|
func startHPAControllerWithRESTClient(ctx ControllerContext) (bool, error) {
|
|
clientConfig := ctx.ClientBuilder.ConfigOrDie("horizontal-pod-autoscaler")
|
|
metricsClient := metrics.NewRESTMetricsClient(
|
|
resourceclient.NewForConfigOrDie(clientConfig),
|
|
custom_metrics.NewForConfigOrDie(clientConfig),
|
|
)
|
|
return startHPAControllerWithMetricsClient(ctx, metricsClient)
|
|
}
|
|
|
|
func startHPAControllerWithLegacyClient(ctx ControllerContext) (bool, error) {
|
|
hpaClient := ctx.ClientBuilder.ClientOrDie("horizontal-pod-autoscaler")
|
|
metricsClient := metrics.NewHeapsterMetricsClient(
|
|
hpaClient,
|
|
metrics.DefaultHeapsterNamespace,
|
|
metrics.DefaultHeapsterScheme,
|
|
metrics.DefaultHeapsterService,
|
|
metrics.DefaultHeapsterPort,
|
|
)
|
|
return startHPAControllerWithMetricsClient(ctx, metricsClient)
|
|
}
|
|
|
|
func startHPAControllerWithMetricsClient(ctx ControllerContext, metricsClient metrics.MetricsClient) (bool, error) {
|
|
hpaClient := ctx.ClientBuilder.ClientOrDie("horizontal-pod-autoscaler")
|
|
replicaCalc := podautoscaler.NewReplicaCalculator(metricsClient, hpaClient.Core())
|
|
go podautoscaler.NewHorizontalController(
|
|
ctx.ClientBuilder.ClientGoClientOrDie("horizontal-pod-autoscaler").Core(),
|
|
hpaClient.Extensions(),
|
|
hpaClient.Autoscaling(),
|
|
replicaCalc,
|
|
ctx.InformerFactory.Autoscaling().V1().HorizontalPodAutoscalers(),
|
|
ctx.Options.HorizontalPodAutoscalerSyncPeriod.Duration,
|
|
).Run(ctx.Stop)
|
|
return true, nil
|
|
}
|