Skip to content

K
k3s
Unverified Commit ea0c683e authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #65301 from wojtek-t/heapster_node_first

Automatic merge from submit-queue (batch tested with PRs 65301, 65291, 65307, 63845, 65313). 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>. Create heapster node first This should help with mitigating failures like this: https://storage.googleapis.com/kubernetes-jenkins/logs/ci-kubernetes-e2e-gce-scale-correctness/127/build-log.txt
parents 1b43cd1a 226aa730
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 5 deletions
cluster/gce/util.sh
View file @ ea0c683e
...@@ -2317,6 +2317,8 @@ function create-nodes() { ...@@ -2317,6 +2317,8 @@ function create-nodes() {
if [[ -z "${HEAPSTER_MACHINE_TYPE:-}" ]]; then if [[ -z "${HEAPSTER_MACHINE_TYPE:-}" ]]; then
local -r nodes="${NUM_NODES}" local -r nodes="${NUM_NODES}"
else else
echo "Creating a special node for heapster with machine-type ${HEAPSTER_MACHINE_TYPE}"
create-heapster-node
local -r nodes=$(( NUM_NODES - 1 )) local -r nodes=$(( NUM_NODES - 1 ))
fi fi
...@@ -2346,11 +2348,6 @@ function create-nodes() { ...@@ -2346,11 +2348,6 @@ function create-nodes() {
--zone "${ZONE}" \ --zone "${ZONE}" \
--project "${PROJECT}" || true; --project "${PROJECT}" || true;
done done
if [[ -n "${HEAPSTER_MACHINE_TYPE:-}" ]]; then
echo "Creating a special node for heapster with machine-type ${HEAPSTER_MACHINE_TYPE}"
create-heapster-node
fi
} }
# Assumes: # Assumes:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment