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

add 'projects/' suffix if this library is used with an older version of the google api library

Browse Source 
Signed-off-by: Paco Xu <paco.xu@daocloud.io>
This commit is contained in:
Paco Xu 2021-08-06 11:25:50 +08:00
parent 2d3323d1fb
commit 768d69a423
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
staging/src/k8s.io/legacy-cloud-providers/gce/gce.go
View File

@ -435,9 +435,15 @@ func CreateGCECloud(config *CloudConfig) (*Cloud, error) {
serviceAlpha.UserAgent = userAgent serviceAlpha.UserAgent = userAgent
if config.APIEndpoint != "" { if config.APIEndpoint != "" {
service.BasePath = config.APIEndpoint if strings.HasSuffix(service.BasePath, "/projects/") {
serviceBeta.BasePath = strings.Replace(config.APIEndpoint, "v1", "beta", -1) service.BasePath = getProjectsBasePath(config.APIEndpoint)
serviceAlpha.BasePath = strings.Replace(config.APIEndpoint, "v1", "alpha", -1) serviceBeta.BasePath = getProjectsBasePath(strings.Replace(config.APIEndpoint, "v1", "beta", -1))
serviceAlpha.BasePath = getProjectsBasePath(strings.Replace(config.APIEndpoint, "v1", "alpha", -1))
} else {
service.BasePath = config.APIEndpoint
serviceBeta.BasePath = strings.Replace(config.APIEndpoint, "v1", "beta", -1)
serviceAlpha.BasePath = strings.Replace(config.APIEndpoint, "v1", "alpha", -1)
}
} }
containerService, err := container.NewService(context.Background(), option.WithTokenSource(config.TokenSource)) containerService, err := container.NewService(context.Background(), option.WithTokenSource(config.TokenSource))