github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-13 13:55:41 +00:00
Code Issues Projects Releases Wiki Activity

gke provider: Fix "gcloud .* describe" checks in util.sh

Browse Source 
This basically prevents you from re-running e2es cross-project on the
GKE provider. (The current Jenkins jobs that have been moved to
different projects are working kind of accidentally.)

(cherry picked from commit 6f1d60ed31)
This commit is contained in:
Zach Loafman 2015-06-02 07:01:23 -07:00 committed by Brendan Burns
parent 74468bb3b7
commit b2a3831361
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gke/util.sh
View File

@ -116,7 +116,7 @@ function kube-up() {
detect-project >&2 detect-project >&2
# Make the specified network if we need to. # Make the specified network if we need to.
if ! gcloud compute networks describe "${NETWORK}" &>/dev/null; then if ! gcloud compute networks --project "${PROJECT}" describe "${NETWORK}" &>/dev/null; then
echo "Creating new network: ${NETWORK}" >&2 echo "Creating new network: ${NETWORK}" >&2
gcloud compute networks create "${NETWORK}" --project="${PROJECT}" --range "${NETWORK_RANGE}" gcloud compute networks create "${NETWORK}" --project="${PROJECT}" --range "${NETWORK_RANGE}"
else else
@ -125,7 +125,7 @@ function kube-up() {
# Allow SSH on all nodes in the network. This doesn't actually check whether # Allow SSH on all nodes in the network. This doesn't actually check whether
# such a rule exists, only whether we've created this exact rule. # such a rule exists, only whether we've created this exact rule.
if ! gcloud compute firewall-rules describe "${FIREWALL_SSH}" &>/dev/null; then if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${FIREWALL_SSH}" &>/dev/null; then
echo "Creating new firewall for SSH: ${FIREWALL_SSH}" >&2 echo "Creating new firewall for SSH: ${FIREWALL_SSH}" >&2
gcloud compute firewall-rules create "${FIREWALL_SSH}" \ gcloud compute firewall-rules create "${FIREWALL_SSH}" \
--allow="tcp:22" \ --allow="tcp:22" \