From a3318a87c0d92b7b698878004fda499ee0d958d6 Mon Sep 17 00:00:00 2001 From: wanyaoqi Date: Wed, 1 Apr 2020 19:59:58 +0800 Subject: [PATCH] host session use internal endpoint --- pkg/hostman/hostutils/hostutils.go | 6 +++--- pkg/mcclient/auth/auth.go | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/hostman/hostutils/hostutils.go b/pkg/hostman/hostutils/hostutils.go index e5c3f261a8..601419e108 100644 --- a/pkg/hostman/hostutils/hostutils.go +++ b/pkg/hostman/hostutils/hostutils.go @@ -53,15 +53,15 @@ type IHost interface { } func GetComputeSession(ctx context.Context) *mcclient.ClientSession { - return auth.GetAdminSessionWithPublic(ctx, options.HostOptions.Region, "v2") + return auth.GetAdminSessionWithInternal(ctx, options.HostOptions.Region, "v2") } func GetK8sSession(ctx context.Context) *mcclient.ClientSession { - return auth.GetAdminSessionWithPublic(ctx, options.HostOptions.Region, "") + return auth.GetAdminSessionWithInternal(ctx, options.HostOptions.Region, "") } func GetImageSession(ctx context.Context, zone string) *mcclient.ClientSession { - return auth.AdminSessionWithPublic(ctx, options.HostOptions.Region, zone, "v1") + return auth.AdminSessionWithInternal(ctx, options.HostOptions.Region, zone, "v1") } func TaskFailed(ctx context.Context, reason string) { diff --git a/pkg/mcclient/auth/auth.go b/pkg/mcclient/auth/auth.go index 6e618c3153..e3b5291c5b 100644 --- a/pkg/mcclient/auth/auth.go +++ b/pkg/mcclient/auth/auth.go @@ -356,6 +356,11 @@ func GetAdminSessionWithPublic(ctx context.Context, region string, return GetSessionWithPublic(ctx, manager.adminCredential, region, apiVersion) } +func GetAdminSessionWithInternal( + ctx context.Context, region string, apiVersion string) *mcclient.ClientSession { + return GetSessionWithInternal(ctx, manager.adminCredential, region, apiVersion) +} + func GetSession(ctx context.Context, token mcclient.TokenCredential, region string, apiVersion string) *mcclient.ClientSession { if len(globalEndpointType) != 0 { return getSessionByType(ctx, token, region, apiVersion, globalEndpointType)