github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51545 from sttts/sttts-deepcopy-e2e

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 47054, 50398, 51541, 51535, 51545)

e2e/integration: simplify deepcopy calls
This commit is contained in:
Kubernetes Submit Queue
2017-08-30 01:51:37 -07:00
committed by GitHub
parent f25e34c12f 637fe0844c
commit 1fc7cd3d1d
8 changed files with 7 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/e2e.go
View File

@@ -62,11 +62,11 @@ func setupProviderConfig() error {
glog.Info("The --provider flag is not set. Treating as a conformance test. Some tests may not be run.")
case "gce", "gke":
var err error
framework.Logf("Fetching cloud provider for %q\r\n", framework.TestContext.Provider)
zone := framework.TestContext.CloudConfig.Zone
region := framework.TestContext.CloudConfig.Region
var err error
if region == "" {
region, err = gcecloud.GetGCERegion(zone)
if err != nil {