Merge pull request #47095 from MrHohn/fix-e2e-firewall-multizone

Automatic merge from submit-queue (batch tested with PRs 47922, 47195, 47241, 47095, 47401)

Fix firewall e2e test for multizone CIs

Fixes #46894.

- Getting node/master tags from config instead of instance.
- Don't assume instance always run in default zone.

/assign @freehan 

**Release note**:

```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-06-22 21:33:31 -07:00
committed by GitHub
7 changed files with 34 additions and 31 deletions

View File

@@ -452,6 +452,7 @@ manifest-url-header
masquerade-all
master-os-distro
master-service-namespace
master-tag
max-concurrency
max-connection-bytes-per-sec
maximum-dead-containers
@@ -512,6 +513,7 @@ node-schedulable-timeout
node-startup-grace-period
node-status-update-frequency
node-sync-period
node-tag
no-headers
no-headers
non-masquerade-cidr