github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 09:49:50 +00:00
Code Issues Projects Releases Wiki Activity

Fix merge conflicts.

Browse Source
This commit is contained in:
Erik McClenney 2017-09-29 13:55:54 -07:00
parent 15816b382e
commit 7aa9a46067
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/cloudprovider/providers/gce/gce.go
View File

@ -21,11 +21,8 @@ import (
"io" "io"
"net/http" "net/http"
"regexp" "regexp"
<<<<<<< master
"runtime" "runtime"
=======
"strconv" "strconv"
>>>>>>> master
"strings" "strings"
"sync" "sync"
"time" "time"
@ -348,19 +345,17 @@ func generateCloudConfig(configFile *ConfigFile) (cloudConfig *CloudConfig, err
// If no tokenSource is specified, uses oauth2.DefaultTokenSource. // If no tokenSource is specified, uses oauth2.DefaultTokenSource.
// If managedZones is nil / empty all zones in the region will be managed. // If managedZones is nil / empty all zones in the region will be managed.
func CreateGCECloud(config *CloudConfig) (*GCECloud, error) { 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. // Remove any pre-release version and build metadata from the semver, leaving only the MAJOR.MINOR.PATCH portion.
// See http://semver.org/. // See http://semver.org/.
version := strings.TrimLeft(strings.Split(strings.Split(version.Get().GitVersion, "-")[0], "+")[0], "v") 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. // 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) userAgent := fmt.Sprintf("Kubernetes/%s (%s %s)", version, runtime.GOOS, runtime.GOARCH)
=======
// Use ProjectID for NetworkProjectID, if it wasn't explicitly set. // Use ProjectID for NetworkProjectID, if it wasn't explicitly set.
if config.NetworkProjectID == "" { if config.NetworkProjectID == "" {
config.NetworkProjectID = config.ProjectID config.NetworkProjectID = config.ProjectID
} }
>>>>>>> master
client, err := newOauthClient(config.TokenSource) client, err := newOauthClient(config.TokenSource)
if err != nil { if err != nil {