Enable HorizontalPodAutoscalerUseRESTClients option

This commit is contained in:
Karol Wychowaniec 2017-09-28 16:01:27 +02:00
parent 5bad51f616
commit f3fddaedd0
3 changed files with 15 additions and 10 deletions

View File

@ -1602,6 +1602,10 @@ function start-kube-controller-manager {
if [[ -n "${CLUSTER_SIGNING_DURATION:-}" ]]; then if [[ -n "${CLUSTER_SIGNING_DURATION:-}" ]]; then
params+=" --experimental-cluster-signing-duration=$CLUSTER_SIGNING_DURATION" params+=" --experimental-cluster-signing-duration=$CLUSTER_SIGNING_DURATION"
fi fi
# disable using HPA metrics REST clients if metrics-server isn't enabled
if [[ "${ENABLE_METRICS_SERVER:-}" != "true" ]]; then
params+=" --horizontal-pod-autoscaler-use-rest-clients=false"
fi
local -r kube_rc_docker_tag=$(cat /home/kubernetes/kube-docker-files/kube-controller-manager.docker_tag) local -r kube_rc_docker_tag=$(cat /home/kubernetes/kube-docker-files/kube-controller-manager.docker_tag)
local container_env="" local container_env=""

View File

@ -115,7 +115,7 @@ func NewCMServer() *CMServer {
ClusterSigningDuration: metav1.Duration{Duration: helpers.OneYear}, ClusterSigningDuration: metav1.Duration{Duration: helpers.OneYear},
ReconcilerSyncLoopPeriod: metav1.Duration{Duration: 60 * time.Second}, ReconcilerSyncLoopPeriod: metav1.Duration{Duration: 60 * time.Second},
EnableTaintManager: true, EnableTaintManager: true,
HorizontalPodAutoscalerUseRESTClients: false, HorizontalPodAutoscalerUseRESTClients: true,
}, },
} }
s.LeaderElection.LeaderElect = true s.LeaderElection.LeaderElect = true

View File

@ -200,6 +200,7 @@ func TestAddFlags(t *testing.T) {
ReconcilerSyncLoopPeriod: metav1.Duration{Duration: 30 * time.Second}, ReconcilerSyncLoopPeriod: metav1.Duration{Duration: 30 * time.Second},
Controllers: []string{"foo", "bar"}, Controllers: []string{"foo", "bar"},
EnableTaintManager: false, EnableTaintManager: false,
HorizontalPodAutoscalerUseRESTClients: true,
UseServiceAccountCredentials: true, UseServiceAccountCredentials: true,
}, },
Kubeconfig: "/kubeconfig", Kubeconfig: "/kubeconfig",