Merge pull request #56561 from shyamjvs/fix-min-cpu-selection-in-kubeup

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>. Fix --min-cpu-platform argument to gcloud in kube-up Should fix the issue I pointed here - https://github.com/kubernetes/kubernetes/pull/56486#issuecomment-347788769 /cc @porridge /assign @wojtek-t /kind bug /priority critical-urgent /sig scalability ```release-note NONE ```

Merge pull request #56561 from shyamjvs/fix-min-cpu-selection-in-kubeup
2aeace40 · Kubernetes Submit Queue · GitHub · 76287fed · 46f17fed · 2aeace40
Unverified Commit 2aeace40 authored Nov 29, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 29, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 12 deletions

master-helper.sh cluster/gce/container-linux/master-helper.sh +1 -6

master-helper.sh cluster/gce/gci/master-helper.sh +1 -6

No files found.
--- a/cluster/gce/container-linux/master-helper.sh
+++ b/cluster/gce/container-linux/master-helper.sh
@@ -79,11 +79,6 @@ function create-master-instance-internal() {
    preemptible_master="--preemptible --maintenance-policy TERMINATE"
  fi

-  local min_cpu_platform=""
-  if [[ -n "${MASTER_MIN_CPU_ARCHITECTURE:-}" ]]; then
-    min_cpu_platform="--min-cpu-platform=${MASTER_MIN_CPU_ARCHITECTURE}"
-  fi
-
  local network=$(make-gcloud-network-argument \
    "${NETWORK_PROJECT}" "${REGION}" "${NETWORK}" "${SUBNETWORK:-}" \
    "${address:-}" "${ENABLE_IP_ALIASES:-}" "${IP_ALIAS_SIZE:-}")
@@ -111,8 +106,8 @@ function create-master-instance-internal() {
      --metadata-from-file "${metadata}" \
      --disk "${disk}" \
      --boot-disk-size "${MASTER_ROOT_DISK_SIZE}" \
+      ${MASTER_MIN_CPU_ARCHITECTURE:+"--min-cpu-platform=${MASTER_MIN_CPU_ARCHITECTURE}"} \
      ${preemptible_master} \
-      ${min_cpu_platform} \
      ${network} 2>&1); then
      echo "${result}" >&2
      return 0

--- a/cluster/gce/gci/master-helper.sh
+++ b/cluster/gce/gci/master-helper.sh
@@ -94,11 +94,6 @@ function create-master-instance-internal() {
    preemptible_master="--preemptible --maintenance-policy TERMINATE"
  fi

-  local min_cpu_platform=""
-  if [[ -n "${MASTER_MIN_CPU_ARCHITECTURE:-}" ]]; then
-    min_cpu_platform="--min-cpu-platform=${MASTER_MIN_CPU_ARCHITECTURE}"
-  fi
-
  local network=$(make-gcloud-network-argument \
    "${NETWORK_PROJECT}" "${REGION}" "${NETWORK}" "${SUBNETWORK:-}" \
    "${address:-}" "${ENABLE_IP_ALIASES:-}" "${IP_ALIAS_SIZE:-}")
@@ -131,8 +126,8 @@ function create-master-instance-internal() {
      --metadata-from-file "${metadata}" \
      --disk "${disk}" \
      --boot-disk-size "${MASTER_ROOT_DISK_SIZE}" \
+      ${MASTER_MIN_CPU_ARCHITECTURE:+"--min-cpu-platform=${MASTER_MIN_CPU_ARCHITECTURE}"} \
      ${preemptible_master} \
-      ${min_cpu_platform} \
      ${network} 2>&1); then
      echo "${result}" >&2
      return 0