From 0f039e866e00dd232b4c48aa7ed0f425e9e3e011 Mon Sep 17 00:00:00 2001 From: Zexi Li Date: Mon, 7 Feb 2022 15:24:21 +0800 Subject: [PATCH] feat(region,keystone): add enable_tls_migration config (#13379) --- pkg/apis/identity/consts.go | 1 + pkg/cloudcommon/options/changes.go | 3 +++ pkg/cloudcommon/options/options.go | 2 ++ pkg/compute/models/guest_actions.go | 3 +++ 4 files changed, 9 insertions(+) diff --git a/pkg/apis/identity/consts.go b/pkg/apis/identity/consts.go index b8c5c9ea52..200183ff9c 100644 --- a/pkg/apis/identity/consts.go +++ b/pkg/apis/identity/consts.go @@ -114,6 +114,7 @@ var ( "platform_names", "is_forget_login_user", "enable_organization", + "enable_tls_migration", }, } diff --git a/pkg/cloudcommon/options/changes.go b/pkg/cloudcommon/options/changes.go index 2b00a65668..6b337406c7 100644 --- a/pkg/cloudcommon/options/changes.go +++ b/pkg/cloudcommon/options/changes.go @@ -53,6 +53,9 @@ func OnBaseOptionsChange(oOpts, nOpts interface{}) bool { if oldOpts.ApiServer != newOpts.ApiServer { log.Debugf("api_server changed from %s to %s", oldOpts.ApiServer, newOpts.ApiServer) } + if oldOpts.EnableTlsMigration != newOpts.EnableTlsMigration { + log.Debugf("enable_tls_migration changed from %v to %v", oldOpts.EnableTlsMigration, newOpts.EnableTlsMigration) + } return changed } diff --git a/pkg/cloudcommon/options/options.go b/pkg/cloudcommon/options/options.go index d2842ea526..b575a4e9fc 100644 --- a/pkg/cloudcommon/options/options.go +++ b/pkg/cloudcommon/options/options.go @@ -110,6 +110,8 @@ type BaseOptions struct { PlatformName string `help:"identity name of this platform" default:"Cloudpods"` PlatformNames map[string]string `help:"identity name of this platform by language"` + + EnableTlsMigration bool `help:"Enable TLS migration" default:"false"` } const ( diff --git a/pkg/compute/models/guest_actions.go b/pkg/compute/models/guest_actions.go index c67c43ff95..95f1332c43 100644 --- a/pkg/compute/models/guest_actions.go +++ b/pkg/compute/models/guest_actions.go @@ -491,6 +491,9 @@ func (self *SGuest) PerformLiveMigrate(ctx context.Context, userCred mcclient.To if err := self.validateMigrate(ctx, userCred, nil, input); err != nil { return nil, err } + if input.EnableTLS == nil { + input.EnableTLS = &options.Options.EnableTlsMigration + } return nil, self.StartGuestLiveMigrateTask(ctx, userCred, self.Status, input.PreferHost, input.SkipCpuCheck, input.EnableTLS, "") }