From 7aa9a46067a9adc829017540e47f6f7e17e13acf Mon Sep 17 00:00:00 2001 From: Erik McClenney Date: Fri, 29 Sep 2017 13:55:54 -0700 Subject: [PATCH] Fix merge conflicts. --- pkg/cloudprovider/providers/gce/gce.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pkg/cloudprovider/providers/gce/gce.go b/pkg/cloudprovider/providers/gce/gce.go index 4e74de1318b..a6b7103524f 100644 --- a/pkg/cloudprovider/providers/gce/gce.go +++ b/pkg/cloudprovider/providers/gce/gce.go @@ -21,11 +21,8 @@ import ( "io" "net/http" "regexp" -<<<<<<< master "runtime" -======= "strconv" ->>>>>>> master "strings" "sync" "time" @@ -348,19 +345,17 @@ func generateCloudConfig(configFile *ConfigFile) (cloudConfig *CloudConfig, err // If no tokenSource is specified, uses oauth2.DefaultTokenSource. // If managedZones is nil / empty all zones in the region will be managed. func CreateGCECloud(config *CloudConfig) (*GCECloud, error) { -<<<<<<< master // Remove any pre-release version and build metadata from the semver, leaving only the MAJOR.MINOR.PATCH portion. // See http://semver.org/. version := strings.TrimLeft(strings.Split(strings.Split(version.Get().GitVersion, "-")[0], "+")[0], "v") // Create a user-agent header append string to supply to the Google API clients, to identify Kubernetes as the origin of the GCP API calls. userAgent := fmt.Sprintf("Kubernetes/%s (%s %s)", version, runtime.GOOS, runtime.GOARCH) -======= + // Use ProjectID for NetworkProjectID, if it wasn't explicitly set. if config.NetworkProjectID == "" { config.NetworkProjectID = config.ProjectID } ->>>>>>> master client, err := newOauthClient(config.TokenSource) if err != nil {