Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
81159792
Commit
81159792
authored
Jul 07, 2017
by
Minhan Xia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
support GCE alpha beta API override
parent
aeb326e9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
3 deletions
+14
-3
BUILD
pkg/cloudprovider/providers/gce/BUILD
+1
-0
gce.go
pkg/cloudprovider/providers/gce/gce.go
+13
-3
No files found.
pkg/cloudprovider/providers/gce/BUILD
View file @
81159792
...
@@ -56,6 +56,7 @@ go_library(
...
@@ -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",
...
...
pkg/cloudprovider/providers/gce/gce.go
View file @
81159792
...
@@ -39,6 +39,7 @@ import (
...
@@ -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 {
...
@@ -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
...
@@ -273,16 +275,24 @@ func CreateGCECloud(apiEndpoint, projectID, networkProjectID, region, zone strin
return
nil
,
err
return
nil
,
err
}
}
if
apiEndpoint
!=
""
{
client
,
err
=
newOauthClient
(
tokenSource
)
service
.
BasePath
=
fmt
.
Sprintf
(
"%sprojects/"
,
apiEndpoint
)
serviceBeta
,
err
:=
computebeta
.
New
(
client
)
if
err
!=
nil
{
return
nil
,
err
}
}
client
,
err
=
newOauthClient
(
tokenSource
)
client
,
err
=
newOauthClient
(
tokenSource
)
service
Beta
,
err
:=
computebet
a
.
New
(
client
)
service
Alpha
,
err
:=
computealph
a
.
New
(
client
)
if
err
!=
nil
{
if
err
!=
nil
{
return
nil
,
err
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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment