opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2961 from zexi/feature/host-use-public-endpoint

Browse Source 
host: use public endpoint
This commit is contained in:
yunion-ci-robot
2019-09-17 23:38:23 +08:00
committed by GitHub
parent 2f154f4b21 aae6f1e6b9
commit 7ab0474ca2
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/hostman/hostutils/hostutils.go
+3 -3
View File
@@ -52,15 +52,15 @@ type IHost interface {
}
func GetComputeSession(ctx context.Context) *mcclient.ClientSession {
return auth.GetAdminSession(ctx, options.HostOptions.Region, "v2")
return auth.GetAdminSessionWithPublic(ctx, options.HostOptions.Region, "v2")
}
func GetK8sSession(ctx context.Context) *mcclient.ClientSession {
return auth.GetAdminSession(ctx, options.HostOptions.Region, "")
return auth.GetAdminSessionWithPublic(ctx, options.HostOptions.Region, "")
}
func GetImageSession(ctx context.Context, zone string) *mcclient.ClientSession {
return auth.AdminSession(ctx, options.HostOptions.Region, zone, "internal", "v1")
return auth.AdminSessionWithPublic(ctx, options.HostOptions.Region, zone, "v1")
}
func TaskFailed(ctx context.Context, reason string) {
pkg/hostman/storageman/imagecache_local.go
+1 -1
View File
@@ -171,7 +171,7 @@ func (l *SLocalImageCache) prepare(ctx context.Context, zone, srcUrl, format str
l.consumerCount++
return true, true
}
url, err := auth.GetServiceURL("image", "", zone, "internal")
url, err := auth.GetServiceURL("image", "", zone, "public")
if err != nil {
log.Errorf("Failed to acquire image %s", err)
return false, true
pkg/mcclient/auth/auth.go
+26 -1
View File
@@ -279,6 +279,14 @@ func AdminSession(ctx context.Context, region, zone, endpointType, apiVersion st
return cli.NewSession(ctx, region, zone, endpointType, AdminCredential(), apiVersion)
}
func AdminSessionWithInternal(ctx context.Context, region, zone, apiVersion string) *mcclient.ClientSession {
return AdminSession(ctx, region, zone, "internal", apiVersion)
}
func AdminSessionWithPublic(ctx context.Context, region, zone, apiVersion string) *mcclient.ClientSession {
return AdminSession(ctx, region, zone, "public", apiVersion)
}
type AuthCompletedCallback func()
func (callback *AuthCompletedCallback) Run() {
@@ -317,8 +325,25 @@ func GetAdminSession(ctx context.Context, region string,
return GetSession(ctx, manager.adminCredential, region, apiVersion)
}
func GetAdminSessionWithPublic(ctx context.Context, region string,
apiVersion string) *mcclient.ClientSession {
return GetSessionWithPublic(ctx, manager.adminCredential, region, apiVersion)
}
func GetSession(ctx context.Context, token mcclient.TokenCredential, region string, apiVersion string) *mcclient.ClientSession {
return manager.client.NewSession(ctx, region, "", "internal", token, apiVersion)
return GetSessionWithInternal(ctx, token, region, apiVersion)
}
func GetSessionWithInternal(ctx context.Context, token mcclient.TokenCredential, region string, apiVersion string) *mcclient.ClientSession {
return getSessionByType(ctx, token, region, apiVersion, "internal")
}
func GetSessionWithPublic(ctx context.Context, token mcclient.TokenCredential, region string, apiVersion string) *mcclient.ClientSession {
return getSessionByType(ctx, token, region, apiVersion, "public")
}
func getSessionByType(ctx context.Context, token mcclient.TokenCredential, region string, apiVersion string, epType string) *mcclient.ClientSession {
return manager.client.NewSession(ctx, region, "", epType, token, apiVersion)
}
// use for climc test only