Merge pull request #56482 from aleksandra-malinowska/hpa-use-rest-clients-var

Automatic merge from submit-queue. 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>. Add checking HPA_USE_REST_CLIENTS Add checking HPA_USE_REST_CLIENTS in addition to ENABLE_METRICS_SERVER when disabling REST clients use for HPA. ```release-note NONE ```

Merge pull request #56482 from aleksandra-malinowska/hpa-use-rest-clients-var
a8a5d44a · Kubernetes Submit Queue · GitHub · 6af5b9ce · fa9ff699 · a8a5d44a
Unverified Commit a8a5d44a authored Nov 29, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

configure-helper.sh cluster/gce/gci/configure-helper.sh +4 -2

No files found.
--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1807,8 +1807,10 @@ function start-kube-controller-manager {
  if [[ -n "${CLUSTER_SIGNING_DURATION:-}" ]]; then
    params+=" --experimental-cluster-signing-duration=$CLUSTER_SIGNING_DURATION"
  fi
-  # disable using HPA metrics REST clients if metrics-server isn't enabled
-  if [[ "${ENABLE_METRICS_SERVER:-}" != "true" ]]; then
+  # Disable using HPA metrics REST clients if metrics-server isn't enabled,
+  # or if we want to explicitly disable it by setting HPA_USE_REST_CLIENT.
+  if [[ "${ENABLE_METRICS_SERVER:-}" != "true" ]] ||
+     [[ "${HPA_USE_REST_CLIENTS:-}" == "false" ]]; then
    params+=" --horizontal-pod-autoscaler-use-rest-clients=false"
  fi