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

Apply test firewalls to both the new gke- node tags and the old k8s- tags

Browse Source
This commit is contained in:
CJ Cullen 2015-06-11 08:49:00 -07:00
parent c99d18b6d5
commit 69f5765fa2
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cluster/gke/util.sh
View File

@ -168,7 +168,8 @@ function test-setup() {
detect-project >&2 detect-project >&2
# At this point, CLUSTER_NAME should have been used, so its value is final. # At this point, CLUSTER_NAME should have been used, so its value is final.
MINION_TAG="k8s-${CLUSTER_NAME}-node" MINION_TAG="gke-${CLUSTER_NAME}-node"
OLD_MINION_TAG="k8s-${CLUSTER_NAME}-node"
# Open up port 80 & 8080 so common containers on minions can be reached. # Open up port 80 & 8080 so common containers on minions can be reached.
# TODO(mbforbes): Is adding ${USER} necessary, and sufficient, to avoid # TODO(mbforbes): Is adding ${USER} necessary, and sufficient, to avoid
@ -177,14 +178,14 @@ function test-setup() {
"${MINION_TAG}-${USER}-http-alt" \ "${MINION_TAG}-${USER}-http-alt" \
--allow tcp:80,tcp:8080 \ --allow tcp:80,tcp:8080 \
--project "${PROJECT}" \ --project "${PROJECT}" \
--target-tags "${MINION_TAG}" \ --target-tags "${MINION_TAG},${OLD_MINION_TAG}" \
--network="${NETWORK}" --network="${NETWORK}"
"${GCLOUD}" compute firewall-rules create \ "${GCLOUD}" compute firewall-rules create \
"${MINION_TAG}-${USER}-nodeports" \ "${MINION_TAG}-${USER}-nodeports" \
--allow tcp:30000-32767,udp:30000-32767 \ --allow tcp:30000-32767,udp:30000-32767 \
--project "${PROJECT}" \ --project "${PROJECT}" \
--target-tags "${MINION_TAG}" \ --target-tags "${MINION_TAG},${OLD_MINION_TAG}" \
--network="${NETWORK}" --network="${NETWORK}"
} }
@ -311,7 +312,7 @@ function test-teardown() {
detect-project >&2 detect-project >&2
# At this point, CLUSTER_NAME should have been used, so its value is final. # At this point, CLUSTER_NAME should have been used, so its value is final.
MINION_TAG="k8s-${CLUSTER_NAME}-node" MINION_TAG="gke-${CLUSTER_NAME}-node"
# First, remove anything we did with test-setup (currently, the firewall). # First, remove anything we did with test-setup (currently, the firewall).
# NOTE: Keep in sync with names above in test-setup. # NOTE: Keep in sync with names above in test-setup.