github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

support GCE alpha beta API override

Browse Source
This commit is contained in:
Minhan Xia 2017-07-07 13:48:36 -07:00
parent aeb326e9bc
commit 811597926a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/cloudprovider/providers/gce/BUILD
View File

@ -56,6 +56,7 @@ go_library(
"//vendor/golang.org/x/oauth2:go_default_library", "//vendor/golang.org/x/oauth2:go_default_library",
"//vendor/golang.org/x/oauth2/google:go_default_library", "//vendor/golang.org/x/oauth2/google:go_default_library",
"//vendor/google.golang.org/api/cloudkms/v1:go_default_library", "//vendor/google.golang.org/api/cloudkms/v1:go_default_library",
"//vendor/google.golang.org/api/compute/v0.alpha:go_default_library",
"//vendor/google.golang.org/api/compute/v0.beta:go_default_library", "//vendor/google.golang.org/api/compute/v0.beta:go_default_library",
"//vendor/google.golang.org/api/compute/v1:go_default_library", "//vendor/google.golang.org/api/compute/v1:go_default_library",
"//vendor/google.golang.org/api/container/v1:go_default_library", "//vendor/google.golang.org/api/container/v1:go_default_library",

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

@ -39,6 +39,7 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"golang.org/x/oauth2/google" "golang.org/x/oauth2/google"
cloudkms "google.golang.org/api/cloudkms/v1" cloudkms "google.golang.org/api/cloudkms/v1"
computealpha "google.golang.org/api/compute/v0.alpha"
computebeta "google.golang.org/api/compute/v0.beta" computebeta "google.golang.org/api/compute/v0.beta"
compute "google.golang.org/api/compute/v1" compute "google.golang.org/api/compute/v1"
container "google.golang.org/api/container/v1" container "google.golang.org/api/container/v1"
@ -85,6 +86,7 @@ type GCECloud struct {
service *compute.Service service *compute.Service
serviceBeta *computebeta.Service serviceBeta *computebeta.Service
serviceAlpha *computealpha.Service
containerService *container.Service containerService *container.Service
cloudkmsService *cloudkms.Service cloudkmsService *cloudkms.Service
clientBuilder controller.ControllerClientBuilder clientBuilder controller.ControllerClientBuilder
@ -273,16 +275,24 @@ func CreateGCECloud(apiEndpoint, projectID, networkProjectID, region, zone strin
return nil, err return nil, err
} }
if apiEndpoint != "" {
service.BasePath = fmt.Sprintf("%sprojects/", apiEndpoint)
}
client, err = newOauthClient(tokenSource) client, err = newOauthClient(tokenSource)
serviceBeta, err := computebeta.New(client) serviceBeta, err := computebeta.New(client)
if err != nil { if err != nil {
return nil, err return nil, err
} }
client, err = newOauthClient(tokenSource)
serviceAlpha, err := computealpha.New(client)
if err != nil {
return nil, err
}
if apiEndpoint != "" {
service.BasePath = fmt.Sprintf("%sprojects/", apiEndpoint)
serviceBeta.BasePath = fmt.Sprintf("%sprojects/", strings.Replace(apiEndpoint, "v1", "beta", 0))
serviceAlpha.BasePath = fmt.Sprintf("%sprojects/", strings.Replace(apiEndpoint, "v1", "alpha", 0))
}
containerService, err := container.New(client) containerService, err := container.New(client)
if err != nil { if err != nil {
return nil, err return nil, err