github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
```
pull/6/head
Kubernetes Submit Queue 2017-11-29 03:55:10 -08:00 committed by GitHub
parent 76287fedbe 46f17fed8a
commit 2aeace402a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cluster/gce/container-linux/master-helper.sh
View File

@ -79,11 +79,6 @@ function create-master-instance-internal() {
preemptible_master="--preemptible --maintenance-policy TERMINATE" preemptible_master="--preemptible --maintenance-policy TERMINATE"
fi 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 \ local network=$(make-gcloud-network-argument \
"${NETWORK_PROJECT}" "${REGION}" "${NETWORK}" "${SUBNETWORK:-}" \ "${NETWORK_PROJECT}" "${REGION}" "${NETWORK}" "${SUBNETWORK:-}" \
"${address:-}" "${ENABLE_IP_ALIASES:-}" "${IP_ALIAS_SIZE:-}") "${address:-}" "${ENABLE_IP_ALIASES:-}" "${IP_ALIAS_SIZE:-}")
@ -111,8 +106,8 @@ function create-master-instance-internal() {
--metadata-from-file "${metadata}" \ --metadata-from-file "${metadata}" \
--disk "${disk}" \ --disk "${disk}" \
--boot-disk-size "${MASTER_ROOT_DISK_SIZE}" \ --boot-disk-size "${MASTER_ROOT_DISK_SIZE}" \
${MASTER_MIN_CPU_ARCHITECTURE:+"--min-cpu-platform=${MASTER_MIN_CPU_ARCHITECTURE}"} \
${preemptible_master} \ ${preemptible_master} \
${min_cpu_platform} \
${network} 2>&1); then ${network} 2>&1); then
echo "${result}" >&2 echo "${result}" >&2
return 0 return 0

7
cluster/gce/gci/master-helper.sh
View File

@ -94,11 +94,6 @@ function create-master-instance-internal() {
preemptible_master="--preemptible --maintenance-policy TERMINATE" preemptible_master="--preemptible --maintenance-policy TERMINATE"
fi 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 \ local network=$(make-gcloud-network-argument \
"${NETWORK_PROJECT}" "${REGION}" "${NETWORK}" "${SUBNETWORK:-}" \ "${NETWORK_PROJECT}" "${REGION}" "${NETWORK}" "${SUBNETWORK:-}" \
"${address:-}" "${ENABLE_IP_ALIASES:-}" "${IP_ALIAS_SIZE:-}") "${address:-}" "${ENABLE_IP_ALIASES:-}" "${IP_ALIAS_SIZE:-}")
@ -131,8 +126,8 @@ function create-master-instance-internal() {
--metadata-from-file "${metadata}" \ --metadata-from-file "${metadata}" \
--disk "${disk}" \ --disk "${disk}" \
--boot-disk-size "${MASTER_ROOT_DISK_SIZE}" \ --boot-disk-size "${MASTER_ROOT_DISK_SIZE}" \
${MASTER_MIN_CPU_ARCHITECTURE:+"--min-cpu-platform=${MASTER_MIN_CPU_ARCHITECTURE}"} \
${preemptible_master} \ ${preemptible_master} \
${min_cpu_platform} \
${network} 2>&1); then ${network} 2>&1); then
echo "${result}" >&2 echo "${result}" >&2
return 0 return 0