diff --git a/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go b/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go
index 43ed7f217f..320d178c81 100644
--- a/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go
+++ b/bcs-scenarios/bcs-gitops-manager/cmd/gitgenerator-webhook/webhook/webhook.go
@@ -364,8 +364,8 @@ func (s *AdmissionWebhookServer) interceptAppSyncWithForbid(ctx context.Context,
 		blog.Errorf("not need intercept with forbidden flag because unmarshal application request error")
 		return nil
 	}
-	state := reqApp.Status.OperationState
-	if state == nil || state.Phase != synccommon.OperationRunning {
+	// 如果没有设置app的operation,就忽略
+	if reqApp.Operation == nil {
 		return nil
 	}
 	app, err := s.argoStore.GetApplication(ctx, req.Name)
diff --git a/bcs-services/bcs-bscp/cmd/data-service/app/app.go b/bcs-services/bcs-bscp/cmd/data-service/app/app.go
index 8c3f746687..510a9f2848 100644
--- a/bcs-services/bcs-bscp/cmd/data-service/app/app.go
+++ b/bcs-services/bcs-bscp/cmd/data-service/app/app.go
@@ -14,6 +14,7 @@
 package app
 
 import (
+	"context"
 	"fmt"
 	"math"
 	"net"
@@ -34,6 +35,7 @@ import (
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/cc"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/criteria/uuid"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/dal/dao"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/dal/repository"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/dal/vault"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/logs"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/metrics"
@@ -42,6 +44,8 @@ import (
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/runtime/ctl"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/runtime/shutdown"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/serviced"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/space"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/thirdparty/esb/client"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/tools"
 )
 
@@ -80,12 +84,15 @@ func Run(opt *options.Option) error {
 }
 
 type dataService struct {
-	serve   *grpc.Server
-	gwServe *http.Server
-	service *service.Service
-	sd      serviced.Service
-	daoSet  dao.Set
-	vault   vault.Set
+	serve    *grpc.Server
+	gwServe  *http.Server
+	service  *service.Service
+	sd       serviced.Service
+	daoSet   dao.Set
+	vault    vault.Set
+	esb      client.Client
+	spaceMgr *space.Manager
+	repo     repository.Provider
 }
 
 // prepare do prepare jobs before run data service.
@@ -139,28 +146,61 @@ func (ds *dataService) prepare(opt *options.Option) error {
 	state := crontab.NewSyncClientOnlineState(ds.daoSet, ds.sd)
 	state.Run()
 
-	// initial Vault set
+	// initialize vault
+	if ds.vault, err = initVault(); err != nil {
+		return err
+	}
+
+	// initialize esb client
+	settings := cc.DataService().Esb
+	esbCli, err := client.NewClient(&settings, metrics.Register())
+	if err != nil {
+		return fmt.Errorf("new esb client failed, err: %v", err)
+	}
+	ds.esb = esbCli
+
+	// initialize space manager
+	spaceMgr, err := space.NewSpaceMgr(context.Background(), esbCli)
+	if err != nil {
+		return fmt.Errorf("init space manager failed, err: %v", err)
+	}
+	ds.spaceMgr = spaceMgr
+
+	// initialize repo provider
+	repo, err := repository.NewProvider(cc.DataService().Repo)
+	if err != nil {
+		return fmt.Errorf("new repo provider failed, err: %v", err)
+	}
+	ds.repo = repo
+
+	// sync files from master to slave repo
+	if cc.DataService().Repo.EnableHA {
+		repoSyncer := service.NewRepoSyncer(ds.daoSet, ds.repo, ds.spaceMgr, ds.sd)
+		repoSyncer.Run()
+	}
+
+	return nil
+}
+
+func initVault() (vault.Set, error) {
 	vaultSet, err := vault.NewSet(cc.DataService().Vault)
 	if err != nil {
-		return fmt.Errorf("initial vault set failed, err: %v", err)
+		return nil, fmt.Errorf("initial vault set failed, err: %v", err)
 	}
 	// 挂载目录
 	exists, err := vaultSet.IsMountPathExists(vault.MountPath)
 	if err != nil {
-		return fmt.Errorf("error checking mount path: %v", err)
+		return nil, fmt.Errorf("error checking mount path: %v", err)
 	}
 	if !exists {
 		mountConfig := &api.MountInput{
 			Type: "kv-v2",
 		}
 		if err = vaultSet.CreateMountPath(vault.MountPath, mountConfig); err != nil {
-			return fmt.Errorf("initial vault mount path failed, err: %v", err)
+			return nil, fmt.Errorf("initial vault mount path failed, err: %v", err)
 		}
 	}
-
-	ds.vault = vaultSet
-
-	return nil
+	return vaultSet, nil
 }
 
 // listenAndServe listen the grpc serve and set up the shutdown gracefully job.
@@ -197,7 +237,7 @@ func (ds *dataService) listenAndServe() error {
 	}
 
 	serve := grpc.NewServer(opts...)
-	svc, err := service.NewService(ds.sd, ds.daoSet, ds.vault)
+	svc, err := service.NewService(ds.sd, ds.daoSet, ds.vault, ds.esb, ds.repo)
 	if err != nil {
 		return err
 	}
diff --git a/bcs-services/bcs-bscp/cmd/data-service/service/metric.go b/bcs-services/bcs-bscp/cmd/data-service/service/metric.go
new file mode 100644
index 0000000000..f3de70c874
--- /dev/null
+++ b/bcs-services/bcs-bscp/cmd/data-service/service/metric.go
@@ -0,0 +1,62 @@
+/*
+ * Tencent is pleased to support the open source community by making Blueking Container Service available.
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Licensed under the MIT License (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * http://opensource.org/licenses/MIT
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package service
+
+import (
+	"sync"
+
+	"github.com/prometheus/client_golang/prometheus"
+
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/metrics"
+)
+
+var (
+	metricInstance *metric
+	once           sync.Once
+)
+
+func initMetric() *metric {
+	once.Do(func() {
+		m := new(metric)
+		labels := prometheus.Labels{}
+		m.syncQueueLen = prometheus.NewGauge(prometheus.GaugeOpts{
+			Namespace:   metrics.Namespace,
+			Subsystem:   metrics.RepoSyncSubSys,
+			Name:        "sync_queue_len",
+			Help:        "the length of sync queue for repo sync",
+			ConstLabels: labels,
+		})
+		metrics.Register().MustRegister(m.syncQueueLen)
+
+		m.ackQueueLen = prometheus.NewGauge(prometheus.GaugeOpts{
+			Namespace:   metrics.Namespace,
+			Subsystem:   metrics.RepoSyncSubSys,
+			Name:        "ack_queue_len",
+			Help:        "the length of ack queue for repo sync",
+			ConstLabels: labels,
+		})
+		metrics.Register().MustRegister(m.ackQueueLen)
+
+		metricInstance = m
+
+	})
+	return metricInstance
+}
+
+type metric struct {
+	// syncQueueLen records the length of sync queue for repo sync
+	syncQueueLen prometheus.Gauge
+
+	// ackQueueLen records the length of ack queue for repo sync
+	ackQueueLen prometheus.Gauge
+}
diff --git a/bcs-services/bcs-bscp/cmd/data-service/service/repo_syncer.go b/bcs-services/bcs-bscp/cmd/data-service/service/repo_syncer.go
new file mode 100644
index 0000000000..331ae65845
--- /dev/null
+++ b/bcs-services/bcs-bscp/cmd/data-service/service/repo_syncer.go
@@ -0,0 +1,388 @@
+/*
+ * Tencent is pleased to support the open source community by making Blueking Container Service available.
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Licensed under the MIT License (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * http://opensource.org/licenses/MIT
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package service
+
+import (
+	"context"
+	"sort"
+	"strconv"
+	"sync"
+	"sync/atomic"
+	"time"
+
+	"golang.org/x/sync/errgroup"
+
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/cc"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/dal/dao"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/dal/repository"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/kit"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/logs"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/runtime/shutdown"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/serviced"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/space"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/tools"
+)
+
+// NewRepoSyncer new repo syncer
+func NewRepoSyncer(set dao.Set, repo repository.Provider, spaceMgr *space.Manager, sd serviced.Service) *RepoSyncer {
+	return &RepoSyncer{
+		set:      set,
+		repo:     repo,
+		spaceMgr: spaceMgr,
+		state:    sd,
+		metric:   initMetric(),
+	}
+}
+
+// RepoSyncer is repo syncer which sync file from master to slave repo
+type RepoSyncer struct {
+	set      dao.Set
+	repo     repository.Provider
+	spaceMgr *space.Manager
+	state    serviced.Service
+	metric   *metric
+}
+
+// Run runs the repo syncer
+func (s *RepoSyncer) Run() {
+	logs.Infof("begin run repo syncer, sync period is %d seconds", cc.DataService().Repo.SyncPeriodSeconds)
+	kt := kit.New()
+	ctx, cancel := context.WithCancel(kt.Ctx)
+	kt.Ctx = ctx
+
+	go func() {
+		notifier := shutdown.AddNotifier()
+		<-notifier.Signal
+		cancel()
+		notifier.Done()
+	}()
+
+	go s.collectMetrics()
+
+	// sync incremental files
+	go s.syncIncremental(kt)
+
+	go func() {
+		// sync all files at once after service starts a while
+		time.Sleep(time.Second * 10)
+		if s.state.IsMaster() {
+			s.syncAll(kt)
+		} else {
+			logs.Infof("current service instance is slave, skip the task of syncing all repo files")
+		}
+
+		// sync all files periodically
+		ticker := time.NewTicker(time.Duration(cc.DataService().Repo.SyncPeriodSeconds) * time.Second)
+		defer ticker.Stop()
+		for {
+			select {
+			case <-kt.Ctx.Done():
+				logs.Infof("stop repo syncer success")
+				return
+			case <-ticker.C:
+				if !s.state.IsMaster() {
+					logs.Infof("current service instance is slave, skip the task of syncing all repo files")
+					continue
+				}
+				s.syncAll(kt)
+			}
+		}
+	}()
+}
+
+// collectMetrics collects metrics for repo syncer periodically
+func (s *RepoSyncer) collectMetrics() {
+	syncMgr := s.repo.SyncManager()
+	client := syncMgr.QueueClient()
+	syncQueue := syncMgr.QueueName()
+	ackQueue := syncMgr.AckQueueName()
+	ctx := context.Background()
+	for {
+		time.Sleep(time.Second * 5)
+		if syncQueueLen, err := client.LLen(ctx, syncQueue); err != nil {
+			logs.Errorf("get sync queue length failed, err: %v", err)
+		} else {
+			s.metric.syncQueueLen.Set(float64(syncQueueLen))
+		}
+
+		if syncQueueLen, err := client.LLen(ctx, ackQueue); err != nil {
+			logs.Errorf("get sync queue length failed, err: %v", err)
+		} else {
+			s.metric.syncQueueLen.Set(float64(syncQueueLen))
+		}
+	}
+}
+
+type syncStat struct {
+	bizID       int32
+	total       int32
+	success     int32
+	failed      int32
+	skip        int32
+	costSeconds float64
+}
+
+type noFiles struct {
+	bizID     int32
+	fileSigns []string
+}
+
+var (
+	stats          []syncStat
+	noFileInMaster []noFiles
+	syncFailedCnt  int32
+)
+
+const failedLimit = 100
+
+// syncAll syncs all files from master to slave repo
+func (s *RepoSyncer) syncAll(kt *kit.Kit) {
+	logs.Infof("start to sync all repo files")
+	start := time.Now()
+
+	// clear related data for every sync cycle
+	stats = make([]syncStat, 0)
+	noFileInMaster = make([]noFiles, 0)
+	syncFailedCnt = 0
+
+	// get all sorted bizs
+	allBizs := s.spaceMgr.AllCMDBSpaces()
+	bizs := make([]int, 0, len(allBizs))
+	for biz := range allBizs {
+		bizID, _ := strconv.Atoi(biz)
+		bizs = append(bizs, bizID)
+	}
+	sort.Ints(bizs)
+
+	// sync files for all bizs
+	// we think the file count would not be too large for every biz, eg:<100000
+	// so, we directly retrieve all file signatures under one biz from the db
+	// this syncs biz serially (one by one) , and sync files under every biz concurrently
+	for _, biz := range bizs {
+		bizID := uint32(biz)
+		var allSigns []string
+		var normalSigns, releasedNormalSigns, tmplSigns, releasedTmplSigns []string
+		var err error
+		// 未发版的普通配置项
+		if normalSigns, err = s.set.Content().ListAllCISigns(kt, bizID); err != nil {
+			logs.Errorf("list normal ci signs failed, err: %v, rid: %s", err, kt.Rid)
+		} else {
+			allSigns = append(allSigns, normalSigns...)
+		}
+
+		// 已发版的普通配置项
+		if releasedNormalSigns, err = s.set.ReleasedCI().ListAllCISigns(kt, bizID); err != nil {
+			logs.Errorf("list released normal ci signs failed, err: %v, rid: %s", err, kt.Rid)
+		} else {
+			allSigns = append(allSigns, releasedNormalSigns...)
+		}
+
+		// 未发版的模版配置项
+		if tmplSigns, err = s.set.TemplateRevision().ListAllCISigns(kt, bizID); err != nil {
+			logs.Errorf("list template ci signs failed, err: %v, rid: %s", err, kt.Rid)
+		} else {
+			allSigns = append(allSigns, tmplSigns...)
+		}
+
+		// 已发版的模版配置项
+		if releasedTmplSigns, err = s.set.ReleasedAppTemplate().ListAllCISigns(kt, bizID); err != nil {
+			logs.Errorf("list released template ci signs failed, err: %v, rid: %s", err, kt.Rid)
+		} else {
+			allSigns = append(allSigns, releasedTmplSigns...)
+		}
+
+		allSigns = tools.RemoveDuplicateStrings(allSigns)
+		s.syncOneBiz(kt, bizID, allSigns)
+		if atomic.LoadInt32(&syncFailedCnt) > failedLimit {
+			logs.Infof("sync all repo files failed too many times(> %d), stop the sync task, "+
+				"you should check the health of repo service, cost time: %s, rid: %s", failedLimit,
+				time.Since(start), kt.Rid)
+			return
+		}
+	}
+
+	logs.Infof("sync all repo files finished, cost time: %s, rid: %s, stats: %#v", time.Since(start), kt.Rid, stats)
+	if len(noFileInMaster) > 0 {
+		logs.Warnf("sync all repo files found some files not in master, please check the master repo, rid: %s, "+
+			"info: %#v", kt.Rid, noFileInMaster)
+	}
+}
+
+// syncOneBiz syncs all files under one biz concurrently
+func (s *RepoSyncer) syncOneBiz(kt *kit.Kit, bizID uint32, signs []string) {
+	start := time.Now()
+	syncMgr := s.repo.SyncManager()
+	var success, failed, skip int32
+	var nofiles []string
+	var mu sync.Mutex
+
+	// sync files concurrently
+	g, _ := errgroup.WithContext(context.Background())
+	g.SetLimit(10)
+	for _, si := range signs {
+		sign := si
+		g.Go(func() error {
+			if atomic.LoadInt32(&syncFailedCnt) > failedLimit {
+				return nil
+			}
+			kt2 := kt.Clone()
+			kt2.BizID = bizID
+			isSkip, err := syncMgr.Sync(kt2, sign)
+			if err != nil {
+				logs.Errorf("sync file sign %s for biz %d failed, err: %v, rid: %s", sign, bizID, err, kt2.Rid)
+				atomic.AddInt32(&failed, 1)
+				atomic.AddInt32(&syncFailedCnt, 1)
+				if err == repository.ErrNoFileInMaster {
+					mu.Lock()
+					nofiles = append(nofiles, sign)
+					mu.Unlock()
+				}
+				return err
+			}
+			if isSkip {
+				atomic.AddInt32(&skip, 1)
+			} else {
+				atomic.AddInt32(&success, 1)
+			}
+			return nil
+		})
+	}
+	_ = g.Wait()
+
+	if len(nofiles) > 0 {
+		noFileInMaster = append(noFileInMaster, noFiles{
+			bizID:     int32(bizID),
+			fileSigns: nofiles,
+		})
+	}
+
+	cost := time.Since(start)
+	stat := syncStat{
+		bizID:       int32(bizID),
+		total:       int32(len(signs)),
+		success:     success,
+		failed:      failed,
+		skip:        skip,
+		costSeconds: cost.Seconds(),
+	}
+	stats = append(stats, stat)
+	logs.Infof("sync biz [%d] repo files finished, cost time: %s, rid: %s, stat: %#v", bizID, cost, kt.Rid, stat)
+}
+
+// syncIncremental syncs incremental files
+func (s *RepoSyncer) syncIncremental(kt *kit.Kit) {
+	syncMgr := s.repo.SyncManager()
+	client := syncMgr.QueueClient()
+	syncQueue := syncMgr.QueueName()
+	ackQueue := syncMgr.AckQueueName()
+
+	// consider the service crash, the ackQueue may have some messages, we move them to syncQueue and handle them again
+	mvCnt := 0
+	for {
+		kt2 := kt.Clone()
+		msg, err := client.RPopLPush(kt2.Ctx, ackQueue, syncQueue)
+		if err != nil {
+			logs.Errorf("move msg from ackQueue to syncQueue failed, err: %v, rid: %s", err, kt2.Rid)
+		}
+		// msg is empty which means occurring redis.Nil and ackQueue is empty
+		if msg == "" {
+			break
+		}
+		mvCnt++
+	}
+	if mvCnt > 0 {
+		logs.Errorf("have moved %d msg from ackQueue to syncQueue", mvCnt)
+	}
+
+	// sync files concurrently
+	workerCount := 10
+	var wg sync.WaitGroup
+	for i := 0; i < workerCount; i++ {
+		wg.Add(1)
+		go func() {
+			defer wg.Done()
+			for {
+				kt2 := kt.Clone()
+				// block pop msg from syncQueue and push one to ackQueue
+				msg, err := client.BRPopLPush(kt2.Ctx, syncQueue, ackQueue, 0)
+				if err != nil {
+					logs.Errorf("pop msg from syncQueue failed, err: %v, rid: %s", err, kt2.Rid)
+					time.Sleep(time.Second)
+					continue
+				}
+
+				var bizID uint32
+				var sign string
+				bizID, sign, err = syncMgr.ParseQueueMsg(msg)
+				if err != nil {
+					logs.Errorf("parse queue msg failed, err: %v, rid: %s", err, kt2.Rid)
+					// remove the invalid msg from ackQueue
+					if err = client.LRem(kt2.Ctx, ackQueue, 0, msg); err != nil {
+						logs.Errorf("remove msg from ackQueue failed, err: %v, rid: %s", err, kt2.Rid)
+					}
+					continue
+				}
+
+				// sync the file with the specific bizID and signature
+				kt2.BizID = bizID
+				if _, err = syncMgr.Sync(kt2, sign); err != nil {
+					logs.Errorf("sync file failed, err: %v, rid: %s", err, kt2.Rid)
+					// if failed for no file in master, continue and not to retry it
+					if err == repository.ErrNoFileInMaster {
+						continue
+					}
+					// if failed for other reasons, retry after a delay
+					go retryMessage(kt2, syncMgr, ackQueue, msg, sign)
+					continue
+				} else {
+					// if success, remove the msg from ackQueue
+					if err = client.LRem(kt2.Ctx, ackQueue, 0, msg); err != nil {
+						logs.Errorf("remove msg from ackQueue failed, err: %v, rid: %s", err, kt2.Rid)
+					}
+				}
+			}
+		}()
+	}
+
+	// wait for all workers to finish (they won't, as this is an infinite loop)
+	wg.Wait()
+}
+
+// retryMessage retry handle the failed msg after a delay
+// if retry failed beyond the limit, finish the retry and all-sync mechanism will handle it
+func retryMessage(kt *kit.Kit, syncMgr *repository.SyncManager, ackQueue, msg, sign string) {
+	limit := 3
+	count := 0
+	for {
+		// wait for 1 minute before retrying
+		time.Sleep(1 * time.Minute)
+
+		if count == 0 {
+			// remove the msg from ackQueue,
+			if err := syncMgr.QueueClient().LRem(kt.Ctx, ackQueue, 0, msg); err != nil {
+				logs.Errorf("remove msg from ackQueue during retry failed, err: %v, rid: %s", err, kt.Rid)
+				continue
+			}
+		}
+		count++
+
+		if _, err := syncMgr.Sync(kt, sign); err != nil {
+			logs.Errorf("sync retry count %d failed, err: %v, rid: %s", count, err, kt.Rid)
+			// retry failed beyond the limit, return and all-sync mechanism will handle it
+			if count >= limit {
+				return
+			}
+		}
+		return
+	}
+}
diff --git a/bcs-services/bcs-bscp/cmd/data-service/service/service.go b/bcs-services/bcs-bscp/cmd/data-service/service/service.go
index 258955ab4b..7009e29da7 100644
--- a/bcs-services/bcs-bscp/cmd/data-service/service/service.go
+++ b/bcs-services/bcs-bscp/cmd/data-service/service/service.go
@@ -19,11 +19,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/cc"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/dal/dao"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/dal/repository"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/dal/vault"
-	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/metrics"
 	pbds "github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/protocol/data-service"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/serviced"
 	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/thirdparty/esb/client"
@@ -42,7 +40,8 @@ type Service struct {
 }
 
 // NewService create a service instance.
-func NewService(sd serviced.Service, daoSet dao.Set, vaultSet vault.Set) (*Service, error) {
+func NewService(sd serviced.Service, daoSet dao.Set, vaultSet vault.Set, esb client.Client, repo repository.Provider) (
+	*Service, error) {
 	state, ok := sd.(serviced.State)
 	if !ok {
 		return nil, errors.New("discover convert state failed")
@@ -52,24 +51,11 @@ func NewService(sd serviced.Service, daoSet dao.Set, vaultSet vault.Set) (*Servi
 		return nil, fmt.Errorf("new gateway failed, err: %v", err)
 	}
 
-	// initialize esb client
-	settings := cc.DataService().Esb
-	esbCli, err := client.NewClient(&settings, metrics.Register())
-	if err != nil {
-		return nil, err
-	}
-
-	// initialize repo provider
-	repo, err := repository.NewProvider(cc.DataService().Repo)
-	if err != nil {
-		return nil, err
-	}
-
 	svc := &Service{
 		dao:      daoSet,
 		vault:    vaultSet,
 		gateway:  gateway,
-		esb:      esbCli,
+		esb:      esb,
 		repo:     repo,
 		tmplProc: tmplprocess.NewTmplProcessor(),
 	}
diff --git a/bcs-services/bcs-bscp/cmd/feed-server/service/rpc_sidecar.go b/bcs-services/bcs-bscp/cmd/feed-server/service/rpc_sidecar.go
index 6713acf075..8a707fe411 100644
--- a/bcs-services/bcs-bscp/cmd/feed-server/service/rpc_sidecar.go
+++ b/bcs-services/bcs-bscp/cmd/feed-server/service/rpc_sidecar.go
@@ -459,7 +459,10 @@ func (s *Service) GetDownloadURL(ctx context.Context, req *pbfs.GetDownloadURLRe
 	}
 
 	if !s.rl.Enable() {
-		return &pbfs.GetDownloadURLResp{Url: downloadLink, WaitTimeMil: 0}, nil
+		return &pbfs.GetDownloadURLResp{
+			Url:         downloadLink[0], // 保留Url兼容老版客户端，DownloadLink方法返回无错误则downloadLink长度必大于0，无需判断
+			Urls:        downloadLink,
+			WaitTimeMil: 0}, nil
 	}
 	// 对于单个大文件下载，受限于单个客户端和服务端之间的带宽（比如为10MB/s=80Mb/s），而在存储服务端支持更高带宽的情况下（比如100MB/s），
 	// 哪怕单个文件2GB，在限流器阈值比单个客户端下载带宽高的情况下，还是应该允许其他客户端去存储服务端下载，
@@ -488,7 +491,10 @@ func (s *Service) GetDownloadURL(ctx context.Context, req *pbfs.GetDownloadURLRe
 	if bWaitTimeMil < gWaitTimeMil {
 		wt = gWaitTimeMil
 	}
-	return &pbfs.GetDownloadURLResp{Url: downloadLink, WaitTimeMil: wt}, nil
+	return &pbfs.GetDownloadURLResp{
+		Url:         downloadLink[0], // 保留Url兼容老版客户端，DownloadLink方法返回无错误则downloadLink长度必大于0，无需判断
+		Urls:        downloadLink,
+		WaitTimeMil: wt}, nil
 }
 
 // PullKvMeta pull an app's latest release metadata only when the app's configures is kv type.
diff --git a/bcs-services/bcs-bscp/etc/bcs-bscp.yml b/bcs-services/bcs-bscp/etc/bcs-bscp.yml
index 80e76a0cca..5d9483bc5b 100644
--- a/bcs-services/bcs-bscp/etc/bcs-bscp.yml
+++ b/bcs-services/bcs-bscp/etc/bcs-bscp.yml
@@ -56,13 +56,33 @@ redisCluster:
   password:
   db: 1
 
-# feed server
-repository:
-  endpoints:
-    - xxx
-  token: xx
-  project: bscp
-  user: xx
 downstream:
   bounceIntervalHour: 48
 
+# 文件存储配置，兼容原有配置，原有配置为主存储master配置
+repository:
+  # 文件存储类型，当前支持bkrepo、s3类型，s3实现为cos存储，默认为bkrepo
+  storageType: bkrepo
+  #storageType: s3
+  bkRepo:
+    endpoints:
+    project:
+    username:
+    password:
+  redisCluster:
+    db:
+    endpoints:
+    password:
+  # 是否开启高可用，使用主从模式，支持读高可用（写主并同步给从，主从均可读），默认为false（即只使用主存储master配置），为true时需有slave配置
+  enableHA:
+  # 高可用下的主从同步周期，用于全量同步，单位为秒，默认是1天，最小值为1小时，低于最小值会重置为默认值
+  syncPeriodSeconds:
+  slave:
+    #storageType: bkrepo
+    storageType: s3
+    s3:
+      endpoint:
+      accessKeyID:
+      secretAccessKey:
+      useSSL:
+      bucketName:
diff --git a/bcs-services/bcs-bscp/pkg/cc/types.go b/bcs-services/bcs-bscp/pkg/cc/types.go
index 3ed488b994..1e63181305 100644
--- a/bcs-services/bcs-bscp/pkg/cc/types.go
+++ b/bcs-services/bcs-bscp/pkg/cc/types.go
@@ -344,10 +344,18 @@ const (
 
 // Repository defines all the repo related runtime.
 type Repository struct {
-	StorageType  StorageMode   `yaml:"storageType"`
-	S3           S3Storage     `yaml:"s3"`
-	BkRepo       BkRepoStorage `yaml:"bkRepo"`
-	RedisCluster RedisCluster  `yaml:"redisCluster"`
+	BaseRepo          `yaml:",inline"`
+	RedisCluster      RedisCluster `yaml:"redisCluster"`
+	EnableHA          bool         `yaml:"enableHA"`
+	SyncPeriodSeconds uint         `yaml:"syncPeriodSeconds"`
+	Slave             BaseRepo     `yaml:"slave"`
+}
+
+// BaseRepo 文件存储的基础部分
+type BaseRepo struct {
+	StorageType StorageMode   `yaml:"storageType"`
+	S3          S3Storage     `yaml:"s3"`
+	BkRepo      BkRepoStorage `yaml:"bkRepo"`
 }
 
 // BkRepoStorage BKRepo 存储类型
@@ -395,52 +403,83 @@ func (s Repository) OneEndpoint() (string, error) {
 	return addr, nil
 }
 
+const defaultSyncPeriodSeconds = 24 * 3600 // default is 1 day
+const minSyncPeriodSeconds = 3600          // min is 1 hour
+
 func (s *Repository) trySetDefault() {
 	if len(s.StorageType) == 0 {
 		s.StorageType = BkRepo
 	}
 	s.RedisCluster.trySetDefault()
+	if s.EnableHA {
+		if len(s.Slave.StorageType) == 0 {
+			s.Slave.StorageType = S3
+		}
+	}
+	if s.SyncPeriodSeconds == 0 || s.SyncPeriodSeconds < minSyncPeriodSeconds {
+		s.SyncPeriodSeconds = defaultSyncPeriodSeconds
+	}
 }
 
 // validate repo runtime.
 func (s Repository) validate() error {
-	switch strings.ToUpper(string(s.StorageType)) {
+	if err := s.BaseRepo.validate(); err != nil {
+		return fmt.Errorf("repository master config err: %v", err)
+	}
+
+	if err := s.RedisCluster.validate(); err != nil {
+		return fmt.Errorf("repository redis cluster config err: %v", err)
+	}
+
+	if s.EnableHA {
+		if err := s.Slave.validate(); err != nil {
+			return fmt.Errorf("repository slave config err: %v", err)
+		}
+	}
+
+	return nil
+}
+
+// validate repo base part.
+func (b BaseRepo) validate() error {
+	switch strings.ToUpper(string(b.StorageType)) {
 	case string(S3):
-		if len(s.S3.Endpoint) == 0 {
+		if len(b.S3.Endpoint) == 0 {
 			return errors.New("s3 endpoint is not set")
 		}
 
-		if len(s.S3.AccessKeyID) == 0 {
+		if len(b.S3.AccessKeyID) == 0 {
 			return errors.New("s3 accessKeyID is not set")
 		}
 
-		if len(s.S3.SecretAccessKey) == 0 {
+		if len(b.S3.SecretAccessKey) == 0 {
 			return errors.New("s3 secretAccessKey is not set")
 		}
-		if len(s.S3.BucketName) == 0 {
+		if len(b.S3.BucketName) == 0 {
 			return errors.New("s3 bucketName is not set")
 		}
 	case string(BkRepo):
-		if len(s.BkRepo.Endpoints) == 0 {
+		if len(b.BkRepo.Endpoints) == 0 {
 			return errors.New("bk_repo endpoints is not set")
 		}
 
-		if len(s.BkRepo.Username) == 0 {
+		if len(b.BkRepo.Username) == 0 {
 			return errors.New("repo basic auth username is not set")
 		}
 
-		if len(s.BkRepo.Password) == 0 {
+		if len(b.BkRepo.Password) == 0 {
 			return errors.New("repo basic auth password is not set")
 		}
 
-		if len(s.BkRepo.Project) == 0 {
+		if len(b.BkRepo.Project) == 0 {
 			return errors.New("repo project is not set")
 		}
 
-		if err := s.BkRepo.TLS.validate(); err != nil {
+		if err := b.BkRepo.TLS.validate(); err != nil {
 			return fmt.Errorf("repo tls, %v", err)
 		}
-
+	default:
+		return fmt.Errorf("unsupported storage type: %s", string(b.StorageType))
 	}
 
 	return nil
diff --git a/bcs-services/bcs-bscp/pkg/dal/bedis/base.go b/bcs-services/bcs-bscp/pkg/dal/bedis/base.go
index 8d9fe1be19..1035bbf0d9 100644
--- a/bcs-services/bcs-bscp/pkg/dal/bedis/base.go
+++ b/bcs-services/bcs-bscp/pkg/dal/bedis/base.go
@@ -562,3 +562,58 @@ func (bs *bedis) LTrim(ctx context.Context, key string, start, stop int64) (stri
 
 	return value, nil
 }
+
+// LRem removes the first count occurrences of elements equal to element from the list stored at key.
+// count argument influences the operation in the following ways:
+// count > 0: Remove elements equal to element moving from head to tail.
+// count < 0: Remove elements equal to element moving from tail to head.
+// count = 0: Remove all elements equal to element.
+func (bs *bedis) LRem(ctx context.Context, key string, count int64, value interface{}) error {
+	start := time.Now()
+	_, err := bs.client.LRem(ctx, key, count, value).Result()
+	if err != nil {
+		bs.mc.errCounter.With(prm.Labels{"cmd": "lrem"}).Inc()
+		return err
+	}
+	bs.logSlowCmd(ctx, key, time.Since(start))
+	bs.mc.cmdLagMS.With(prm.Labels{"cmd": "lrem"}).Observe(float64(time.Since(start).Milliseconds()))
+	return nil
+}
+
+// RPopLPush atomically returns and removes the last element (tail) of the list stored at source,
+// and pushes the element at the first element (head) of the list stored at destination.
+func (bs *bedis) RPopLPush(ctx context.Context, source, destination string) (string, error) {
+	start := time.Now()
+	value, err := bs.client.RPopLPush(ctx, source, destination).Result()
+	if err != nil {
+		if IsNilError(err) {
+			return "", nil
+		}
+		bs.mc.errCounter.With(prm.Labels{"cmd": "rpoplpush"}).Inc()
+		return "", err
+	}
+	bs.logSlowCmd(ctx, "", time.Since(start))
+	bs.mc.cmdLagMS.With(prm.Labels{"cmd": "rpoplpush"}).Observe(float64(time.Since(start).Milliseconds()))
+
+	return value, nil
+}
+
+// BRPopLPush is the blocking variant of RPOPLPUSH.
+// When source contains elements, this command behaves exactly like RPOPLPUSH.
+// When source is empty, Redis will block the connection until another client pushes to it or until timeout is reached.
+// A timeout of zero can be used to block indefinitely.
+func (bs *bedis) BRPopLPush(ctx context.Context, source, destination string, ttlSeconds int) (string, error) {
+	start := time.Now()
+	value, err := bs.client.BRPopLPush(ctx, source, destination, time.Duration(ttlSeconds)*time.Second).Result()
+	if err != nil {
+		if IsNilError(err) {
+			return "", nil
+		}
+		bs.mc.errCounter.With(prm.Labels{"cmd": "brpoplpush"}).Inc()
+		return "", err
+	}
+	bs.logSlowCmd(ctx, "", time.Since(start))
+	bs.mc.cmdLagMS.With(prm.Labels{"cmd": "brpoplpush"}).Observe(float64(time.Since(start).Milliseconds()))
+
+	return value, nil
+}
diff --git a/bcs-services/bcs-bscp/pkg/dal/bedis/bedis.go b/bcs-services/bcs-bscp/pkg/dal/bedis/bedis.go
index 4aaf700637..7af206ee49 100644
--- a/bcs-services/bcs-bscp/pkg/dal/bedis/bedis.go
+++ b/bcs-services/bcs-bscp/pkg/dal/bedis/bedis.go
@@ -66,6 +66,9 @@ type RedisClient interface {
 	Keys(ctx context.Context, pattern string) *redis.StringSliceCmd
 	LLen(ctx context.Context, key string) *redis.IntCmd
 	LTrim(ctx context.Context, key string, start, stop int64) *redis.StatusCmd
+	LRem(ctx context.Context, key string, count int64, value interface{}) *redis.IntCmd
+	RPopLPush(ctx context.Context, source, destination string) *redis.StringCmd
+	BRPopLPush(ctx context.Context, source, destination string, timeout time.Duration) *redis.StringCmd
 }
 
 // Client defines all the bscp used redis command
@@ -94,6 +97,9 @@ type Client interface {
 	Keys(ctx context.Context, pattern string) ([]string, error)
 	LLen(ctx context.Context, key string) (int64, error)
 	LTrim(ctx context.Context, key string, start, stop int64) (string, error)
+	LRem(ctx context.Context, key string, count int64, value interface{}) error
+	RPopLPush(ctx context.Context, source, destination string) (string, error)
+	BRPopLPush(ctx context.Context, source, destination string, ttlSeconds int) (string, error)
 }
 
 // NewRedisCache create a redis cluster client.
diff --git a/bcs-services/bcs-bscp/pkg/dal/dao/content.go b/bcs-services/bcs-bscp/pkg/dal/dao/content.go
index 19ca11fc29..4b823195ec 100644
--- a/bcs-services/bcs-bscp/pkg/dal/dao/content.go
+++ b/bcs-services/bcs-bscp/pkg/dal/dao/content.go
@@ -36,6 +36,8 @@ type Content interface {
 	Get(kit *kit.Kit, id, bizID uint32) (*table.Content, error)
 	// BatchDeleteWithTx batch delete content data instance with transaction.
 	BatchDeleteWithTx(kit *kit.Kit, tx *gen.QueryTx, contentIDs []uint32) error
+	// ListAllCISigns lists all non-template ci signatures of one biz, and only belongs to existing apps
+	ListAllCISigns(kit *kit.Kit, bizID uint32) ([]string, error)
 }
 
 var _ Content = new(contentDao)
@@ -192,3 +194,26 @@ func (dao *contentDao) validateAttachmentResExist(kit *kit.Kit, am *table.Conten
 
 	return nil
 }
+
+// ListAllCISigns lists all non-template ci signatures of one biz, and only belongs to existing apps
+func (dao *contentDao) ListAllCISigns(kit *kit.Kit, bizID uint32) ([]string, error) {
+	am := dao.genQ.App
+	aq := dao.genQ.App.WithContext(kit.Ctx)
+	var appIDs []uint32
+	if err := aq.Select(am.ID.Distinct()).
+		Where(am.BizID.Eq(bizID)).
+		Pluck(am.ID, &appIDs); err != nil {
+		return nil, err
+	}
+
+	m := dao.genQ.Content
+	q := dao.genQ.Content.WithContext(kit.Ctx)
+	var signs []string
+	if err := q.Select(m.Signature.Distinct()).
+		Where(m.BizID.Eq(bizID), m.AppID.In(appIDs...)).
+		Pluck(m.Signature, &signs); err != nil {
+		return nil, err
+	}
+
+	return signs, nil
+}
diff --git a/bcs-services/bcs-bscp/pkg/dal/dao/release_ci.go b/bcs-services/bcs-bscp/pkg/dal/dao/release_ci.go
index fee92d09e7..4f02c33911 100644
--- a/bcs-services/bcs-bscp/pkg/dal/dao/release_ci.go
+++ b/bcs-services/bcs-bscp/pkg/dal/dao/release_ci.go
@@ -47,6 +47,8 @@ type ReleasedCI interface {
 	ListAllByReleaseIDs(kit *kit.Kit, releasedIDs []uint32, bizID uint32) ([]*table.ReleasedConfigItem, error)
 	// BatchDeleteByReleaseIDWithTx batch delete by release id with transaction.
 	BatchDeleteByReleaseIDWithTx(kit *kit.Kit, tx *gen.QueryTx, bizID, appID, releaseID uint32) error
+	// ListAllCISigns lists all released non-template ci signatures of one biz, and only belongs to existing apps
+	ListAllCISigns(kit *kit.Kit, bizID uint32) ([]string, error)
 }
 
 var _ ReleasedCI = new(releasedCIDao)
@@ -214,3 +216,26 @@ func (dao *releasedCIDao) BatchDeleteByReleaseIDWithTx(kit *kit.Kit, tx *gen.Que
 	_, err := m.WithContext(kit.Ctx).Where(m.BizID.Eq(bizID), m.AppID.Eq(appID), m.ReleaseID.Eq(releaseID)).Delete()
 	return err
 }
+
+// ListAllCISigns lists all released non-template ci signatures of one biz, and only belongs to existing apps
+func (dao *releasedCIDao) ListAllCISigns(kit *kit.Kit, bizID uint32) ([]string, error) {
+	am := dao.genQ.App
+	aq := dao.genQ.App.WithContext(kit.Ctx)
+	var appIDs []uint32
+	if err := aq.Select(am.ID.Distinct()).
+		Where(am.BizID.Eq(bizID)).
+		Pluck(am.ID, &appIDs); err != nil {
+		return nil, err
+	}
+
+	m := dao.genQ.ReleasedConfigItem
+	q := dao.genQ.ReleasedConfigItem.WithContext(kit.Ctx)
+	var signs []string
+	if err := q.Select(m.Signature.Distinct()).
+		Where(m.BizID.Eq(bizID), m.AppID.In(appIDs...)).
+		Pluck(m.Signature, &signs); err != nil {
+		return nil, err
+	}
+
+	return signs, nil
+}
diff --git a/bcs-services/bcs-bscp/pkg/dal/dao/released_app_template.go b/bcs-services/bcs-bscp/pkg/dal/dao/released_app_template.go
index 91fb5461ad..0d033ca91c 100644
--- a/bcs-services/bcs-bscp/pkg/dal/dao/released_app_template.go
+++ b/bcs-services/bcs-bscp/pkg/dal/dao/released_app_template.go
@@ -41,6 +41,8 @@ type ReleasedAppTemplate interface {
 	BatchDeleteByAppIDWithTx(kit *kit.Kit, tx *gen.QueryTx, appID, bizID uint32) error
 	// BatchDeleteByReleaseIDWithTx batch delete by release id with transaction.
 	BatchDeleteByReleaseIDWithTx(kit *kit.Kit, tx *gen.QueryTx, bizID, appID, releaseID uint32) error
+	// ListAllCISigns lists all released template ci signatures of one biz, and only belongs to existing apps
+	ListAllCISigns(kit *kit.Kit, bizID uint32) ([]string, error)
 }
 
 var _ ReleasedAppTemplate = new(releasedAppTemplateDao)
@@ -187,3 +189,26 @@ func (dao *releasedAppTemplateDao) BatchDeleteByReleaseIDWithTx(kit *kit.Kit, tx
 	_, err := m.WithContext(kit.Ctx).Where(m.BizID.Eq(bizID), m.AppID.Eq(appID), m.ReleaseID.Eq(releaseID)).Delete()
 	return err
 }
+
+// ListAllCISigns lists all released template ci signatures of one biz, and only belongs to existing apps
+func (dao *releasedAppTemplateDao) ListAllCISigns(kit *kit.Kit, bizID uint32) ([]string, error) {
+	am := dao.genQ.App
+	aq := dao.genQ.App.WithContext(kit.Ctx)
+	var appIDs []uint32
+	if err := aq.Select(am.ID.Distinct()).
+		Where(am.BizID.Eq(bizID)).
+		Pluck(am.ID, &appIDs); err != nil {
+		return nil, err
+	}
+
+	m := dao.genQ.ReleasedAppTemplate
+	q := dao.genQ.ReleasedAppTemplate.WithContext(kit.Ctx)
+	var signs []string
+	if err := q.Select(m.Signature.Distinct()).
+		Where(m.BizID.Eq(bizID), m.AppID.In(appIDs...)).
+		Pluck(m.Signature, &signs); err != nil {
+		return nil, err
+	}
+
+	return signs, nil
+}
diff --git a/bcs-services/bcs-bscp/pkg/dal/dao/template_revision.go b/bcs-services/bcs-bscp/pkg/dal/dao/template_revision.go
index 68051efdc8..7e9192845a 100644
--- a/bcs-services/bcs-bscp/pkg/dal/dao/template_revision.go
+++ b/bcs-services/bcs-bscp/pkg/dal/dao/template_revision.go
@@ -61,6 +61,8 @@ type TemplateRevision interface {
 	// ListLatestGroupByTemplateIdsWithTx Lists the latest version groups by template ids with transaction.
 	ListLatestGroupByTemplateIdsWithTx(kit *kit.Kit, tx *gen.QueryTx, bizID uint32,
 		templateIDs []uint32) ([]*table.TemplateRevision, error)
+	// ListAllCISigns lists all template ci of one biz, no need care about apps for the unbound template ci
+	ListAllCISigns(kit *kit.Kit, bizID uint32) ([]string, error)
 }
 
 var _ TemplateRevision = new(templateRevisionDao)
@@ -354,3 +356,17 @@ func (dao *templateRevisionDao) ListLatestRevisionsGroupByTemplateIds(kit *kit.K
 	}
 	return find, nil
 }
+
+// ListAllCISigns lists all template ci of one biz, no need care about apps for the unbound template ci
+func (dao *templateRevisionDao) ListAllCISigns(kit *kit.Kit, bizID uint32) ([]string, error) {
+	m := dao.genQ.TemplateRevision
+	q := dao.genQ.TemplateRevision.WithContext(kit.Ctx)
+	var signs []string
+	if err := q.Select(m.Signature.Distinct()).
+		Where(m.BizID.Eq(bizID)).
+		Pluck(m.Signature, &signs); err != nil {
+		return nil, err
+	}
+
+	return signs, nil
+}
diff --git a/bcs-services/bcs-bscp/pkg/dal/repository/bkrepo.go b/bcs-services/bcs-bscp/pkg/dal/repository/bkrepo.go
index 10631ebe21..ef5e51c824 100644
--- a/bcs-services/bcs-bscp/pkg/dal/repository/bkrepo.go
+++ b/bcs-services/bcs-bscp/pkg/dal/repository/bkrepo.go
@@ -87,6 +87,11 @@ func (r *RepoCreated) Exist(name string) bool {
 	return ok
 }
 
+// SyncManager implements HAEnhancer interface
+func (c *bkrepoClient) SyncManager() *SyncManager {
+	return nil
+}
+
 func (c *bkrepoClient) ensureRepo(kt *kit.Kit) error {
 	repoName, err := repo.GenRepoName(kt.BizID)
 	if err != nil {
@@ -113,7 +118,7 @@ func (c *bkrepoClient) ensureRepo(kt *kit.Kit) error {
 	return nil
 }
 
-// Upload file to bkrepo
+// Upload uploads file to bkrepo
 func (c *bkrepoClient) Upload(kt *kit.Kit, sign string, body io.Reader) (*ObjectMetadata, error) {
 	if err := c.ensureRepo(kt); err != nil {
 		return nil, errors.Wrap(err, "ensure repo failed")
@@ -164,7 +169,7 @@ func (c *bkrepoClient) Upload(kt *kit.Kit, sign string, body io.Reader) (*Object
 	return metadata, nil
 }
 
-// Download download file from bkrepo
+// Download downloads file from bkrepo
 func (c *bkrepoClient) Download(kt *kit.Kit, sign string) (io.ReadCloser, int64, error) {
 	node, err := repo.GenNodePath(&repo.NodeOption{Project: c.project, BizID: kt.BizID, Sign: sign})
 	if err != nil {
@@ -377,15 +382,15 @@ func (c *bkrepoClient) URIDecorator(bizID uint32) DecoratorInter {
 }
 
 // DownloadLink bkrepo file download link
-func (c *bkrepoClient) DownloadLink(kt *kit.Kit, sign string, fetchLimit uint32) (string, error) {
+func (c *bkrepoClient) DownloadLink(kt *kit.Kit, sign string, fetchLimit uint32) ([]string, error) {
 	repoName, err := repo.GenRepoName(kt.BizID)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
 	objPath, err := repo.GenNodeFullPath(sign)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
 	// get file download url.
@@ -399,10 +404,10 @@ func (c *bkrepoClient) DownloadLink(kt *kit.Kit, sign string, fetchLimit uint32)
 	})
 
 	if err != nil {
-		return "", errors.Wrap(err, "generate temp download url failed")
+		return nil, errors.Wrap(err, "generate temp download url failed")
 	}
 
-	return url, nil
+	return []string{url}, nil
 }
 
 // AsyncDownload bkrepo
@@ -416,7 +421,7 @@ func (c *bkrepoClient) AsyncDownloadStatus(kt *kit.Kit, sign string, taskID stri
 }
 
 // newBKRepoClient new bkrepo client
-func newBKRepoClient(settings cc.Repository) (BaseProvider, error) {
+func newBKRepoClient(settings cc.BaseRepo) (BaseProvider, error) {
 	cli, err := repo.NewClient(settings, metrics.Register())
 	if err != nil {
 		return nil, err
@@ -445,20 +450,21 @@ func newBKRepoClient(settings cc.Repository) (BaseProvider, error) {
 }
 
 // newBKRepoProvider new bkrepo provider
-func newBKRepoProvider(settings cc.Repository) (Provider, error) {
-	p, err := newBKRepoClient(settings)
+func newBKRepoProvider(repo cc.BaseRepo, redis cc.RedisCluster) (Provider, error) {
+	p, err := newBKRepoClient(repo)
 	if err != nil {
 		return nil, err
 	}
 
 	var c VariableCacher
-	c, err = newVariableCacher(settings.RedisCluster, p)
+	c, err = newVariableCacher(redis, p)
 	if err != nil {
 		return nil, err
 	}
 
 	return &repoProvider{
 		BaseProvider:   p,
+		HAEnhancer:     p.(*bkrepoClient),
 		VariableCacher: c,
 	}, nil
 }
diff --git a/bcs-services/bcs-bscp/pkg/dal/repository/cos.go b/bcs-services/bcs-bscp/pkg/dal/repository/cos.go
index 60f0e0dfe7..c4ca1fb180 100644
--- a/bcs-services/bcs-bscp/pkg/dal/repository/cos.go
+++ b/bcs-services/bcs-bscp/pkg/dal/repository/cos.go
@@ -44,7 +44,12 @@ type cosClient struct {
 	innerClient *cos.Client
 }
 
-// Upload upload file to cos
+// SyncManager implements HAEnhancer interface
+func (c *cosClient) SyncManager() *SyncManager {
+	return nil
+}
+
+// Upload uploads file to cos
 func (c *cosClient) Upload(kt *kit.Kit, sign string, body io.Reader) (*ObjectMetadata, error) {
 	node, err := repo.GenS3NodeFullPath(kt.BizID, sign)
 	if err != nil {
@@ -77,7 +82,7 @@ func (c *cosClient) Upload(kt *kit.Kit, sign string, body io.Reader) (*ObjectMet
 	return metadata, nil
 }
 
-// Download download file from cos
+// Download downloads file from cos
 func (c *cosClient) Download(kt *kit.Kit, sign string) (io.ReadCloser, int64, error) {
 	node, err := repo.GenS3NodeFullPath(kt.BizID, sign)
 	if err != nil {
@@ -170,10 +175,10 @@ func (c *cosClient) URIDecorator(bizID uint32) DecoratorInter {
 }
 
 // DownloadLink cos file download link
-func (c *cosClient) DownloadLink(kt *kit.Kit, sign string, fetchLimit uint32) (string, error) {
+func (c *cosClient) DownloadLink(kt *kit.Kit, sign string, fetchLimit uint32) ([]string, error) {
 	node, err := repo.GenS3NodeFullPath(kt.BizID, sign)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
 	opt := &cos.PresignedURLOptions{
@@ -186,10 +191,10 @@ func (c *cosClient) DownloadLink(kt *kit.Kit, sign string, fetchLimit uint32) (s
 	u, err := c.innerClient.Object.GetPresignedURL(kt.Ctx, http.MethodGet, node, c.conf.AccessKeyID,
 		c.conf.SecretAccessKey, time.Hour, opt)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 
-	return u.String(), nil
+	return []string{u.String()}, nil
 }
 
 // AsyncDownload cos
@@ -229,20 +234,21 @@ func newCosClient(conf cc.S3Storage) (BaseProvider, error) {
 }
 
 // newCosProvider new cos provider
-func newCosProvider(settings cc.Repository) (Provider, error) {
-	p, err := newCosClient(settings.S3)
+func newCosProvider(repo cc.BaseRepo, redis cc.RedisCluster) (Provider, error) {
+	p, err := newCosClient(repo.S3)
 	if err != nil {
 		return nil, err
 	}
 
 	var c VariableCacher
-	c, err = newVariableCacher(settings.RedisCluster, p)
+	c, err = newVariableCacher(redis, p)
 	if err != nil {
 		return nil, err
 	}
 
 	return &repoProvider{
 		BaseProvider:   p,
+		HAEnhancer:     p.(*cosClient),
 		VariableCacher: c,
 	}, nil
 }
diff --git a/bcs-services/bcs-bscp/pkg/dal/repository/ha.go b/bcs-services/bcs-bscp/pkg/dal/repository/ha.go
new file mode 100644
index 0000000000..e0b6512cec
--- /dev/null
+++ b/bcs-services/bcs-bscp/pkg/dal/repository/ha.go
@@ -0,0 +1,310 @@
+/*
+ * Tencent is pleased to support the open source community by making Blueking Container Service available.
+ * Copyright (C) 2019 THL A29 Limited, a Tencent company. All rights reserved.
+ * Licensed under the MIT License (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * http://opensource.org/licenses/MIT
+ * Unless required by applicable law or agreed to in writing, software distributed under
+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package repository
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"strconv"
+	"strings"
+
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/cc"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/criteria/errf"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/dal/bedis"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/kit"
+	"github.com/TencentBlueKing/bk-bcs/bcs-services/bcs-bscp/pkg/logs"
+)
+
+// haClient is client for high availability
+// write to master repo only, read from master or slave repo
+// there is synchronization mechanism which sync data from master to slave
+type haClient struct {
+	master  Provider
+	slave   Provider
+	syncMgr *SyncManager
+}
+
+// SyncManager is sync manager
+type SyncManager struct {
+	queue  *syncQueue
+	master Provider
+	slave  Provider
+}
+
+type syncQueue struct {
+	client bedis.Client
+}
+
+// SyncManager implements HAEnhancer interface
+func (c *haClient) SyncManager() *SyncManager {
+	return c.syncMgr
+}
+
+// Upload Uploads file to ha repo master
+// push file metadata to queue for sync
+func (c *haClient) Upload(kt *kit.Kit, sign string, body io.Reader) (*ObjectMetadata, error) {
+	md, err := c.master.Upload(kt, sign, body)
+	if err != nil {
+		return nil, err
+	}
+	_ = c.syncMgr.PushToQueue(kt, sign)
+	return md, err
+}
+
+func haErr(masterErr, slaveErr error) error {
+	return fmt.Errorf("master error: %v, slave error: %v", masterErr, slaveErr)
+}
+
+// Download downloads file from ha repo, read priority: master > slave
+func (c *haClient) Download(kt *kit.Kit, sign string) (io.ReadCloser, int64, error) {
+	masterBody, masterSize, masterErr := c.master.Download(kt, sign)
+	if masterErr == nil {
+		return masterBody, masterSize, nil
+	}
+
+	slaveBody, slaveSize, slaveErr := c.slave.Download(kt, sign)
+	if slaveErr == nil {
+		return slaveBody, slaveSize, nil
+	}
+
+	return nil, 0, haErr(masterErr, slaveErr)
+}
+
+// Metadata ha repo file metadata
+func (c *haClient) Metadata(kt *kit.Kit, sign string) (*ObjectMetadata, error) {
+	masterMD, masterErr := c.master.Metadata(kt, sign)
+	if masterErr == nil {
+		return masterMD, nil
+	}
+
+	slaveMD, slaveErr := c.slave.Metadata(kt, sign)
+	if slaveErr == nil {
+		return slaveMD, nil
+	}
+
+	return nil, haErr(masterErr, slaveErr)
+}
+
+// InitMultipartUpload init multipart upload file for ha repo master
+// push only after the completion of multipart upload
+func (c *haClient) InitMultipartUpload(kt *kit.Kit, sign string) (string, error) {
+	return c.master.InitMultipartUpload(kt, sign)
+}
+
+// MultipartUpload upload one part of the file to ha repo master
+// push only after the completion of multipart upload
+func (c *haClient) MultipartUpload(kt *kit.Kit, sign string, uploadID string, partNum uint32,
+	body io.Reader) error {
+	return c.master.MultipartUpload(kt, sign, uploadID, partNum, body)
+}
+
+// CompleteMultipartUpload complete multipart upload and return metadata for ha repo master
+// push only after the completion of multipart upload
+func (c *haClient) CompleteMultipartUpload(kt *kit.Kit, sign string, uploadID string) (*ObjectMetadata, error) {
+	md, err := c.master.CompleteMultipartUpload(kt, sign, uploadID)
+	if err != nil {
+		return nil, err
+	}
+	_ = c.syncMgr.PushToQueue(kt, sign)
+	return md, err
+}
+
+// URIDecorator ..
+func (c *haClient) URIDecorator(bizID uint32) DecoratorInter {
+	return newUriDecoratorInter(bizID)
+}
+
+// DownloadLink ha repo file download link, get download url from master and slave
+func (c *haClient) DownloadLink(kt *kit.Kit, sign string, fetchLimit uint32) ([]string, error) {
+	var urls []string
+	masterUrl, masterErr := c.master.DownloadLink(kt, sign, fetchLimit)
+	if masterErr == nil {
+		urls = append(urls, masterUrl...)
+	}
+
+	slaveUrl, slaveErr := c.slave.DownloadLink(kt, sign, fetchLimit)
+	if slaveErr == nil {
+		urls = append(urls, slaveUrl...)
+	}
+
+	if masterErr != nil && slaveErr != nil {
+		return nil, haErr(masterErr, slaveErr)
+	}
+
+	return urls, nil
+}
+
+// AsyncDownload ha repo
+func (c *haClient) AsyncDownload(kt *kit.Kit, sign string) (string, error) {
+	return "", nil
+}
+
+// AsyncDownloadStatus ha repo
+func (c *haClient) AsyncDownloadStatus(kt *kit.Kit, sign string, taskID string) (bool, error) {
+	return false, nil
+}
+
+// newHAClient new ha client
+func newHAClient(settings cc.Repository) (BaseProvider, error) {
+	var master, slave Provider
+	var syncMgr *SyncManager
+	var err error
+	if master, err = newMasterProvider(settings); err != nil {
+		return nil, err
+	}
+	if slave, err = newSlaveProvider(settings); err != nil {
+		return nil, err
+	}
+	if syncMgr, err = newSyncManager(settings.RedisCluster, master, slave); err != nil {
+		return nil, err
+	}
+
+	return &haClient{
+		master:  master,
+		slave:   slave,
+		syncMgr: syncMgr,
+	}, nil
+}
+
+// newMasterProvider new master provider
+func newMasterProvider(settings cc.Repository) (Provider, error) {
+	switch strings.ToUpper(string(settings.StorageType)) {
+	case string(cc.S3):
+		return newCosProvider(settings.BaseRepo, settings.RedisCluster)
+	case string(cc.BkRepo):
+		return newBKRepoProvider(settings.BaseRepo, settings.RedisCluster)
+	}
+	return nil, fmt.Errorf("unsupported storage type: %s", settings.StorageType)
+}
+
+// newSlaveProvider new slave provider
+func newSlaveProvider(settings cc.Repository) (Provider, error) {
+	switch strings.ToUpper(string(settings.Slave.StorageType)) {
+	case string(cc.S3):
+		return newCosProvider(settings.Slave, settings.RedisCluster)
+	case string(cc.BkRepo):
+		return newBKRepoProvider(settings.Slave, settings.RedisCluster)
+	}
+	return nil, fmt.Errorf("unsupported storage type: %s", settings.StorageType)
+}
+
+// newHAProvider new ha provider
+func newHAProvider(settings cc.Repository) (Provider, error) {
+	p, err := newHAClient(settings)
+	if err != nil {
+		return nil, err
+	}
+
+	var c VariableCacher
+	c, err = newVariableCacher(settings.RedisCluster, p)
+	if err != nil {
+		return nil, err
+	}
+
+	return &repoProvider{
+		BaseProvider:   p,
+		HAEnhancer:     p.(*haClient),
+		VariableCacher: c,
+	}, nil
+}
+
+// newSyncManager new a sync manager
+func newSyncManager(redisConf cc.RedisCluster, master, slave Provider) (*SyncManager, error) {
+	// init redis client
+	client, err := bedis.NewRedisCache(redisConf)
+	if err != nil {
+		return nil, fmt.Errorf("new redis cluster failed, err: %v", err)
+	}
+
+	return &SyncManager{
+		queue:  &syncQueue{client: client},
+		master: master,
+		slave:  slave,
+	}, nil
+}
+
+// PushToQueue pushes the file metadata msg to queue so that the master's write operations can be received by slave
+func (s *SyncManager) PushToQueue(kt *kit.Kit, sign string) error {
+	if err := s.QueueClient().LPush(kt.Ctx, s.QueueName(), s.QueueMsg(kt.BizID, sign)); err != nil {
+		logs.Errorf("push file metadata to queue failed, redis lpush err: %v, rid: %s", err, kt.Rid)
+	}
+	return nil
+}
+
+// QueueClient returns client for sync queue
+func (s *SyncManager) QueueClient() bedis.Client {
+	return s.queue.client
+}
+
+// QueueName returns name of sync queue
+func (s *SyncManager) QueueName() string {
+	return "sync_repo_queue"
+}
+
+// AckQueueName returns name of ack queue
+func (s *SyncManager) AckQueueName() string {
+	return "sync_repo_ack_queue"
+}
+
+// QueueMsg returns msg for sync queue
+func (s *SyncManager) QueueMsg(bizID uint32, sign string) string {
+	return fmt.Sprintf("%d_%s", bizID, sign)
+}
+
+// ParseQueueMsg parses msg of sync queue
+func (s *SyncManager) ParseQueueMsg(msg string) (uint32, string, error) {
+	elements := strings.Split(msg, "_")
+	if len(elements) != 2 {
+		return 0, "", fmt.Errorf("parse queue msg into two elements by '_' failed, msg: %s", msg)
+	}
+
+	bizID, err := strconv.ParseInt(elements[0], 10, 64)
+	if err != nil {
+		return 0, "", fmt.Errorf("parse queue msg's bizID failed, msg: %s, bizID: %s", msg, elements[0])
+	}
+	return uint32(bizID), elements[1], nil
+}
+
+// ErrNoFileInMaster is error of no file in master
+var ErrNoFileInMaster = errors.New("file not found in master")
+
+// Sync syncs file from master to slave
+func (s *SyncManager) Sync(kt *kit.Kit, sign string) (skip bool, err error) {
+	_, err = s.slave.Metadata(kt, sign)
+	// the file already exists in slave repo, return directly
+	if err == nil {
+		return true, nil
+	}
+	// if the error is not 404 which means the slave repo service has some trouble, return directly
+	if err != errf.ErrFileContentNotFound {
+		return false, fmt.Errorf("sync file from master to slave failed, slave metadata err: %v", err)
+	}
+
+	reader, _, err := s.master.Download(kt, sign)
+	if err != nil {
+		if err == errf.ErrFileContentNotFound {
+			return false, ErrNoFileInMaster
+		}
+		return false, fmt.Errorf("sync file from master to slave failed, master download err: %v", err)
+	}
+	defer reader.Close()
+
+	// stream the downloaded content to slave repo for uploading
+	_, err = s.slave.Upload(kt, sign, reader)
+	if err != nil {
+		return false, fmt.Errorf("sync file from master to slave failed, slave upload err: %v", err)
+	}
+
+	return false, nil
+}
diff --git a/bcs-services/bcs-bscp/pkg/dal/repository/repository.go b/bcs-services/bcs-bscp/pkg/dal/repository/repository.go
index c6e83477d2..f3a34b784b 100644
--- a/bcs-services/bcs-bscp/pkg/dal/repository/repository.go
+++ b/bcs-services/bcs-bscp/pkg/dal/repository/repository.go
@@ -14,7 +14,6 @@
 package repository
 
 import (
-	"fmt"
 	"io"
 	"net"
 	"net/http"
@@ -79,7 +78,7 @@ type DecoratorInter interface {
 
 // ObjectDownloader 文件下载
 type ObjectDownloader interface {
-	DownloadLink(kt *kit.Kit, sign string, fetchLimit uint32) (string, error)
+	DownloadLink(kt *kit.Kit, sign string, fetchLimit uint32) ([]string, error)
 	AsyncDownload(kt *kit.Kit, sign string) (string, error)
 	AsyncDownloadStatus(kt *kit.Kit, sign string, taskID string) (bool, error)
 	URIDecorator(bizID uint32) DecoratorInter
@@ -96,9 +95,15 @@ type BaseProvider interface {
 	Metadata(kt *kit.Kit, sign string) (*ObjectMetadata, error)
 }
 
+// HAEnhancer high availability enhancer interface
+type HAEnhancer interface {
+	SyncManager() *SyncManager
+}
+
 // Provider repo provider interface
 type Provider interface {
 	BaseProvider
+	HAEnhancer
 	VariableCacher
 }
 
@@ -208,16 +213,15 @@ func newUriDecoratorInter(bizID uint32) DecoratorInter {
 // repoProvider implements interface Provider
 type repoProvider struct {
 	BaseProvider
+	HAEnhancer
 	VariableCacher
 }
 
 // NewProvider init provider factory by storage type
 func NewProvider(conf cc.Repository) (Provider, error) {
-	switch strings.ToUpper(string(conf.StorageType)) {
-	case string(cc.S3):
-		return newCosProvider(conf)
-	case string(cc.BkRepo):
-		return newBKRepoProvider(conf)
+	if conf.EnableHA {
+		return newHAProvider(conf)
 	}
-	return nil, fmt.Errorf("store with type %s is not supported", conf.StorageType)
+
+	return newMasterProvider(conf)
 }
diff --git a/bcs-services/bcs-bscp/pkg/metrics/metric.go b/bcs-services/bcs-bscp/pkg/metrics/metric.go
index 421a6ed643..0b5cb823d0 100644
--- a/bcs-services/bcs-bscp/pkg/metrics/metric.go
+++ b/bcs-services/bcs-bscp/pkg/metrics/metric.go
@@ -71,6 +71,9 @@ const (
 
 	// RestfulSubSys defines rest server's sub system
 	RestfulSubSys = "restful"
+
+	// RepoSyncSubSys defines repo syncer sub system
+	RepoSyncSubSys = "repo_syncer"
 )
 
 // labels
diff --git a/bcs-services/bcs-bscp/pkg/protocol/feed-server/feed_server.pb.go b/bcs-services/bcs-bscp/pkg/protocol/feed-server/feed_server.pb.go
index 4e7b518d3a..0197b6cdbb 100644
--- a/bcs-services/bcs-bscp/pkg/protocol/feed-server/feed_server.pb.go
+++ b/bcs-services/bcs-bscp/pkg/protocol/feed-server/feed_server.pb.go
@@ -1003,8 +1003,9 @@ type GetDownloadURLResp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Url         string `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`
-	WaitTimeMil int64  `protobuf:"varint,2,opt,name=wait_time_mil,json=waitTimeMil,proto3" json:"wait_time_mil,omitempty"` // the time(milliseconds) that the client should wait before downloading file
+	Url         string   `protobuf:"bytes,1,opt,name=url,proto3" json:"url,omitempty"`                                       // compatible with old versions
+	WaitTimeMil int64    `protobuf:"varint,2,opt,name=wait_time_mil,json=waitTimeMil,proto3" json:"wait_time_mil,omitempty"` // the time(milliseconds) that the client should wait before downloading file
+	Urls        []string `protobuf:"bytes,3,rep,name=urls,proto3" json:"urls,omitempty"`                                     // used for high availability
 }
 
 func (x *GetDownloadURLResp) Reset() {
@@ -1053,6 +1054,13 @@ func (x *GetDownloadURLResp) GetWaitTimeMil() int64 {
 	return 0
 }
 
+func (x *GetDownloadURLResp) GetUrls() []string {
+	if x != nil {
+		return x.Urls
+	}
+	return nil
+}
+
 // App 对外简单版本
 type App struct {
 	state         protoimpl.MessageState
@@ -2086,176 +2094,177 @@ var file_feed_server_proto_rawDesc = []byte{
 	0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x46,
 	0x69, 0x6c, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4d, 0x65, 0x74,
 	0x61, 0x12, 0x14, 0x0a, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x4a, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x44, 0x6f,
+	0x52, 0x05, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x22, 0x5e, 0x0a, 0x12, 0x47, 0x65, 0x74, 0x44, 0x6f,
 	0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a,
 	0x03, 0x75, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12,
 	0x22, 0x0a, 0x0d, 0x77, 0x61, 0x69, 0x74, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6d, 0x69, 0x6c,
 	0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x77, 0x61, 0x69, 0x74, 0x54, 0x69, 0x6d, 0x65,
-	0x4d, 0x69, 0x6c, 0x22, 0x78, 0x0a, 0x03, 0x41, 0x70, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61,
-	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x1f,
-	0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x54, 0x79, 0x70, 0x65, 0x12,
-	0x2c, 0x0a, 0x08, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x76, 0x69, 0x73,
-	0x69, 0x6f, 0x6e, 0x52, 0x08, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0x3a, 0x0a,
-	0x0b, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x73, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06,
-	0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x62, 0x69,
-	0x7a, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x02, 0x20, 0x03,
-	0x28, 0x09, 0x52, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0x2d, 0x0a, 0x0c, 0x4c, 0x69, 0x73,
-	0x74, 0x41, 0x70, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04, 0x61, 0x70, 0x70,
-	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41,
-	0x70, 0x70, 0x52, 0x04, 0x61, 0x70, 0x70, 0x73, 0x22, 0x66, 0x0a, 0x0d, 0x50, 0x75, 0x6c, 0x6c,
-	0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x62, 0x69, 0x7a,
+	0x4d, 0x69, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x75, 0x72, 0x6c, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x04, 0x75, 0x72, 0x6c, 0x73, 0x22, 0x78, 0x0a, 0x03, 0x41, 0x70, 0x70, 0x12, 0x0e,
+	0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12,
+	0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61,
+	0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x74, 0x79, 0x70,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x54,
+	0x79, 0x70, 0x65, 0x12, 0x2c, 0x0a, 0x08, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x52,
+	0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f,
+	0x6e, 0x22, 0x3a, 0x0a, 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x73, 0x52, 0x65, 0x71,
+	0x12, 0x15, 0x0a, 0x06, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x05, 0x62, 0x69, 0x7a, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68,
+	0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x22, 0x2d, 0x0a,
+	0x0c, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a,
+	0x04, 0x61, 0x70, 0x70, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x70, 0x62,
+	0x66, 0x73, 0x2e, 0x41, 0x70, 0x70, 0x52, 0x04, 0x61, 0x70, 0x70, 0x73, 0x22, 0x66, 0x0a, 0x0d,
+	0x50, 0x75, 0x6c, 0x6c, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a,
+	0x06, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x62,
+	0x69, 0x7a, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6d, 0x65, 0x74, 0x61,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41, 0x70,
+	0x70, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x14,
+	0x0a, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x6d,
+	0x61, 0x74, 0x63, 0x68, 0x22, 0x58, 0x0a, 0x0e, 0x50, 0x75, 0x6c, 0x6c, 0x4b, 0x76, 0x4d, 0x65,
+	0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73,
+	0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x65,
+	0x61, 0x73, 0x65, 0x49, 0x64, 0x12, 0x27, 0x0a, 0x08, 0x6b, 0x76, 0x5f, 0x6d, 0x65, 0x74, 0x61,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x4b,
+	0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x07, 0x6b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x22, 0xd5,
+	0x01, 0x0a, 0x06, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x17, 0x0a, 0x07, 0x6b,
+	0x76, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6b, 0x76,
+	0x54, 0x79, 0x70, 0x65, 0x12, 0x2c, 0x0a, 0x08, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x62, 0x61, 0x73, 0x65, 0x2e,
+	0x52, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69,
+	0x6f, 0x6e, 0x12, 0x37, 0x0a, 0x0d, 0x6b, 0x76, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d,
+	0x65, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x6b, 0x76,
+	0x2e, 0x4b, 0x76, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0c, 0x6b,
+	0x76, 0x41, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0c, 0x63,
+	0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x16, 0x2e, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x6f,
+	0x6e, 0x74, 0x65, 0x6e, 0x74, 0x53, 0x70, 0x65, 0x63, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65,
+	0x6e, 0x74, 0x53, 0x70, 0x65, 0x63, 0x22, 0x62, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4b, 0x76, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x62, 0x69, 0x7a, 0x5f, 0x69,
+	0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x62, 0x69, 0x7a, 0x49, 0x64, 0x12, 0x28,
+	0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0d, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41, 0x70, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x52,
+	0x07, 0x61, 0x70, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x3f, 0x0a, 0x0e, 0x47, 0x65,
+	0x74, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x17, 0x0a, 0x07,
+	0x6b, 0x76, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6b,
+	0x76, 0x54, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xee, 0x01, 0x0a, 0x10,
+	0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x71,
+	0x12, 0x15, 0x0a, 0x06, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
+	0x52, 0x05, 0x62, 0x69, 0x7a, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0b, 0x62, 0x6b, 0x5f, 0x61, 0x67,
+	0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x6b,
+	0x41, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6c, 0x75, 0x73, 0x74,
+	0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6c, 0x75,
+	0x73, 0x74, 0x65, 0x72, 0x49, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x70, 0x6f, 0x64, 0x5f, 0x69, 0x64,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x64, 0x49, 0x64, 0x12, 0x25, 0x0a,
+	0x0e, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72,
+	0x4e, 0x61, 0x6d, 0x65, 0x12, 0x2b, 0x0a, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x74,
+	0x61, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x46,
+	0x69, 0x6c, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4d, 0x65, 0x74,
+	0x61, 0x12, 0x19, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x64, 0x69, 0x72, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x66, 0x69, 0x6c, 0x65, 0x44, 0x69, 0x72, 0x22, 0x2c, 0x0a, 0x11,
+	0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73,
+	0x70, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x16, 0x41, 0x73,
+	0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75,
+	0x73, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x62, 0x69, 0x7a, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x74,
+	0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61,
+	0x73, 0x6b, 0x49, 0x64, 0x22, 0x4c, 0x0a, 0x17, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77,
+	0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x31, 0x0a, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x19, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e,
+	0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x22, 0x68, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b,
+	0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x62, 0x69, 0x7a,
 	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x62, 0x69, 0x7a, 0x49, 0x64,
 	0x12, 0x28, 0x0a, 0x08, 0x61, 0x70, 0x70, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41, 0x70, 0x70, 0x4d, 0x65, 0x74,
-	0x61, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x61,
-	0x74, 0x63, 0x68, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x61, 0x74, 0x63, 0x68,
-	0x22, 0x58, 0x0a, 0x0e, 0x50, 0x75, 0x6c, 0x6c, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x65,
-	0x73, 0x70, 0x12, 0x1d, 0x0a, 0x0a, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x5f, 0x69, 0x64,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x72, 0x65, 0x6c, 0x65, 0x61, 0x73, 0x65, 0x49,
-	0x64, 0x12, 0x27, 0x0a, 0x08, 0x6b, 0x76, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x73, 0x18, 0x03, 0x20,
-	0x03, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x4b, 0x76, 0x4d, 0x65, 0x74,
-	0x61, 0x52, 0x07, 0x6b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x73, 0x22, 0xd5, 0x01, 0x0a, 0x06, 0x4b,
-	0x76, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x17, 0x0a, 0x07, 0x6b, 0x76, 0x5f, 0x74, 0x79,
-	0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6b, 0x76, 0x54, 0x79, 0x70, 0x65,
-	0x12, 0x2c, 0x0a, 0x08, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x70, 0x62, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x52, 0x65, 0x76, 0x69,
-	0x73, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x72, 0x65, 0x76, 0x69, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x37,
-	0x0a, 0x0d, 0x6b, 0x76, 0x5f, 0x61, 0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x6b, 0x76, 0x2e, 0x4b, 0x76, 0x41,
-	0x74, 0x74, 0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x52, 0x0c, 0x6b, 0x76, 0x41, 0x74, 0x74,
-	0x61, 0x63, 0x68, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x39, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x74, 0x65,
-	0x6e, 0x74, 0x5f, 0x73, 0x70, 0x65, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e,
-	0x70, 0x62, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e,
-	0x74, 0x53, 0x70, 0x65, 0x63, 0x52, 0x0b, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x53, 0x70,
-	0x65, 0x63, 0x22, 0x62, 0x0a, 0x0d, 0x47, 0x65, 0x74, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0d, 0x52, 0x05, 0x62, 0x69, 0x7a, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x08, 0x61, 0x70,
-	0x70, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x70,
-	0x62, 0x66, 0x73, 0x2e, 0x41, 0x70, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x07, 0x61, 0x70, 0x70,
-	0x4d, 0x65, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x3f, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x4b, 0x76, 0x56,
-	0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x17, 0x0a, 0x07, 0x6b, 0x76, 0x5f, 0x74,
-	0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6b, 0x76, 0x54, 0x79, 0x70,
-	0x65, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x22, 0xee, 0x01, 0x0a, 0x10, 0x41, 0x73, 0x79, 0x6e,
-	0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06,
-	0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x62, 0x69,
-	0x7a, 0x49, 0x64, 0x12, 0x1e, 0x0a, 0x0b, 0x62, 0x6b, 0x5f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x62, 0x6b, 0x41, 0x67, 0x65, 0x6e,
-	0x74, 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5f, 0x69,
-	0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x49, 0x64, 0x12, 0x15, 0x0a, 0x06, 0x70, 0x6f, 0x64, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x05, 0x70, 0x6f, 0x64, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x6f, 0x6e,
-	0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0d, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
-	0x12, 0x2b, 0x0a, 0x09, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x06, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x4d,
-	0x65, 0x74, 0x61, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x19, 0x0a,
-	0x08, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x64, 0x69, 0x72, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x07, 0x66, 0x69, 0x6c, 0x65, 0x44, 0x69, 0x72, 0x22, 0x2c, 0x0a, 0x11, 0x41, 0x73, 0x79, 0x6e,
-	0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x12, 0x17, 0x0a,
-	0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
-	0x74, 0x61, 0x73, 0x6b, 0x49, 0x64, 0x22, 0x48, 0x0a, 0x16, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44,
-	0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71,
-	0x12, 0x15, 0x0a, 0x06, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d,
-	0x52, 0x05, 0x62, 0x69, 0x7a, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x74, 0x61, 0x73, 0x6b, 0x5f,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x74, 0x61, 0x73, 0x6b, 0x49, 0x64,
-	0x22, 0x4c, 0x0a, 0x17, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61,
-	0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x12, 0x31, 0x0a, 0x06, 0x73,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x19, 0x2e, 0x70, 0x62,
-	0x66, 0x73, 0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64,
-	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x06, 0x73, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x68,
-	0x0a, 0x13, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x56, 0x61, 0x6c,
-	0x75, 0x65, 0x52, 0x65, 0x71, 0x12, 0x15, 0x0a, 0x06, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x62, 0x69, 0x7a, 0x49, 0x64, 0x12, 0x28, 0x0a, 0x08,
-	0x61, 0x70, 0x70, 0x5f, 0x6d, 0x65, 0x74, 0x61, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d,
-	0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41, 0x70, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x07, 0x61,
-	0x70, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x2a, 0x0a, 0x14, 0x47, 0x65, 0x74, 0x53,
-	0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x22, 0x37, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c,
-	0x65, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12, 0x20, 0x0a, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e, 0x70, 0x62, 0x66, 0x73,
-	0x2e, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x2a, 0x3f, 0x0a,
-	0x13, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74,
-	0x61, 0x74, 0x75, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43, 0x45, 0x53, 0x53, 0x10,
-	0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x4f, 0x57, 0x4e, 0x4c, 0x4f, 0x41, 0x44, 0x49, 0x4e, 0x47,
-	0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44, 0x10, 0x02, 0x32, 0xf7,
-	0x07, 0x0a, 0x08, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x3a, 0x0a, 0x09, 0x48,
-	0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x12, 0x16, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e,
-	0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65,
-	0x1a, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b,
-	0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x73, 0x73, 0x61,
-	0x67, 0x69, 0x6e, 0x67, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73,
-	0x61, 0x67, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x74, 0x61, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x73,
-	0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00,
-	0x12, 0x38, 0x0a, 0x05, 0x57, 0x61, 0x74, 0x63, 0x68, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x73,
-	0x2e, 0x53, 0x69, 0x64, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65, 0x74, 0x61, 0x1a, 0x16,
-	0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x46, 0x65, 0x65, 0x64, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4d,
-	0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x48, 0x0a, 0x0f, 0x50, 0x75,
-	0x6c, 0x6c, 0x41, 0x70, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x18, 0x2e,
-	0x70, 0x62, 0x66, 0x73, 0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x41, 0x70, 0x70, 0x46, 0x69, 0x6c, 0x65,
-	0x4d, 0x65, 0x74, 0x61, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x50,
-	0x75, 0x6c, 0x6c, 0x41, 0x70, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x65,
-	0x73, 0x70, 0x22, 0x00, 0x12, 0x45, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x6c,
-	0x6f, 0x61, 0x64, 0x55, 0x52, 0x4c, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x47, 0x65,
-	0x74, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x71, 0x1a,
-	0x18, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f,
-	0x61, 0x64, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x6a, 0x0a, 0x0a, 0x50,
-	0x75, 0x6c, 0x6c, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x73,
-	0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x65, 0x71, 0x1a, 0x14,
-	0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61,
-	0x52, 0x65, 0x73, 0x70, 0x22, 0x31, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b, 0x3a, 0x01, 0x2a, 0x22,
-	0x26, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x65, 0x64, 0x2f, 0x62, 0x69,
-	0x7a, 0x2f, 0x7b, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6b, 0x76, 0x73, 0x2f, 0x6d,
-	0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x6c, 0x0a, 0x0a, 0x47, 0x65, 0x74, 0x4b, 0x76,
-	0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x47, 0x65, 0x74,
-	0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x14, 0x2e, 0x70, 0x62, 0x66,
-	0x73, 0x2e, 0x47, 0x65, 0x74, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x73, 0x70,
-	0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x3a, 0x01, 0x2a, 0x22, 0x28, 0x2f, 0x61, 0x70,
-	0x69, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x65, 0x64, 0x2f, 0x62, 0x69, 0x7a, 0x2f, 0x7b, 0x62,
-	0x69, 0x7a, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6b, 0x76, 0x73, 0x2f, 0x64, 0x61, 0x74, 0x61, 0x2f,
-	0x7b, 0x6b, 0x65, 0x79, 0x7d, 0x12, 0x33, 0x0a, 0x08, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70,
-	0x73, 0x12, 0x11, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70,
-	0x73, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x4c, 0x69, 0x73, 0x74,
-	0x41, 0x70, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x42, 0x0a, 0x0d, 0x41, 0x73,
-	0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x16, 0x2e, 0x70, 0x62,
-	0x66, 0x73, 0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64,
-	0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63,
-	0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x54,
-	0x0a, 0x13, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x53,
-	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41, 0x73, 0x79,
-	0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
-	0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63,
-	0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x52, 0x65,
-	0x73, 0x70, 0x22, 0x00, 0x12, 0x7f, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c,
-	0x65, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x19, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e,
+	0x61, 0x52, 0x07, 0x61, 0x70, 0x70, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
+	0x79, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x22, 0x2a, 0x0a, 0x14,
 	0x47, 0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65,
-	0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69,
-	0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22,
-	0x34, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2e, 0x3a, 0x01, 0x2a, 0x22, 0x29, 0x2f, 0x61, 0x70, 0x69,
-	0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x65, 0x64, 0x2f, 0x62, 0x69, 0x7a, 0x2f, 0x7b, 0x62, 0x69,
-	0x7a, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6b, 0x76, 0x73, 0x2f, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x2f,
-	0x7b, 0x6b, 0x65, 0x79, 0x7d, 0x12, 0x80, 0x01, 0x0a, 0x0f, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6e,
-	0x67, 0x6c, 0x65, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x19, 0x2e, 0x70, 0x62, 0x66, 0x73,
-	0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75,
-	0x65, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x53,
-	0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x22,
-	0x37, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x31, 0x3a, 0x01, 0x2a, 0x22, 0x2c, 0x2f, 0x61, 0x70, 0x69,
-	0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x65, 0x64, 0x2f, 0x62, 0x69, 0x7a, 0x2f, 0x7b, 0x62, 0x69,
-	0x7a, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6b, 0x76, 0x73, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61,
-	0x74, 0x61, 0x2f, 0x7b, 0x6b, 0x65, 0x79, 0x7d, 0x42, 0x57, 0x5a, 0x55, 0x67, 0x69, 0x74, 0x68,
-	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x54, 0x65, 0x6e, 0x63, 0x65, 0x6e, 0x74, 0x42, 0x6c,
-	0x75, 0x65, 0x4b, 0x69, 0x6e, 0x67, 0x2f, 0x62, 0x6b, 0x2d, 0x62, 0x63, 0x73, 0x2f, 0x62, 0x63,
-	0x73, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x62, 0x63, 0x73, 0x2d, 0x62,
-	0x73, 0x63, 0x70, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c,
-	0x2f, 0x66, 0x65, 0x65, 0x64, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x3b, 0x70, 0x62, 0x66,
-	0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x52, 0x65, 0x73, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x64, 0x61, 0x74, 0x61, 0x22, 0x37, 0x0a, 0x13, 0x47, 0x65, 0x74, 0x53,
+	0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x12,
+	0x20, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0c, 0x2e,
+	0x70, 0x62, 0x66, 0x73, 0x2e, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x04, 0x64, 0x61, 0x74,
+	0x61, 0x2a, 0x3f, 0x0a, 0x13, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f,
+	0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x55, 0x43, 0x43,
+	0x45, 0x53, 0x53, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x44, 0x4f, 0x57, 0x4e, 0x4c, 0x4f, 0x41,
+	0x44, 0x49, 0x4e, 0x47, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x46, 0x41, 0x49, 0x4c, 0x45, 0x44,
+	0x10, 0x02, 0x32, 0xf7, 0x07, 0x0a, 0x08, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12,
+	0x3a, 0x0a, 0x09, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x12, 0x16, 0x2e, 0x70,
+	0x62, 0x66, 0x73, 0x2e, 0x48, 0x61, 0x6e, 0x64, 0x73, 0x68, 0x61, 0x6b, 0x65, 0x4d, 0x65, 0x73,
+	0x73, 0x61, 0x67, 0x65, 0x1a, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x48, 0x61, 0x6e, 0x64,
+	0x73, 0x68, 0x61, 0x6b, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x37, 0x0a, 0x09, 0x4d,
+	0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e,
+	0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x4d, 0x65, 0x74, 0x61, 0x1a, 0x13, 0x2e,
+	0x70, 0x62, 0x66, 0x73, 0x2e, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x69, 0x6e, 0x67, 0x52, 0x65,
+	0x73, 0x70, 0x22, 0x00, 0x12, 0x38, 0x0a, 0x05, 0x57, 0x61, 0x74, 0x63, 0x68, 0x12, 0x13, 0x2e,
+	0x70, 0x62, 0x66, 0x73, 0x2e, 0x53, 0x69, 0x64, 0x65, 0x57, 0x61, 0x74, 0x63, 0x68, 0x4d, 0x65,
+	0x74, 0x61, 0x1a, 0x16, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x46, 0x65, 0x65, 0x64, 0x57, 0x61,
+	0x74, 0x63, 0x68, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x00, 0x30, 0x01, 0x12, 0x48,
+	0x0a, 0x0f, 0x50, 0x75, 0x6c, 0x6c, 0x41, 0x70, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x4d, 0x65, 0x74,
+	0x61, 0x12, 0x18, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x41, 0x70, 0x70,
+	0x46, 0x69, 0x6c, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x70, 0x62,
+	0x66, 0x73, 0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x41, 0x70, 0x70, 0x46, 0x69, 0x6c, 0x65, 0x4d, 0x65,
+	0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x45, 0x0a, 0x0e, 0x47, 0x65, 0x74, 0x44,
+	0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x52, 0x4c, 0x12, 0x17, 0x2e, 0x70, 0x62, 0x66,
+	0x73, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x52, 0x4c,
+	0x52, 0x65, 0x71, 0x1a, 0x18, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x44, 0x6f,
+	0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x55, 0x52, 0x4c, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12,
+	0x6a, 0x0a, 0x0a, 0x50, 0x75, 0x6c, 0x6c, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x13, 0x2e,
+	0x70, 0x62, 0x66, 0x73, 0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52,
+	0x65, 0x71, 0x1a, 0x14, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x50, 0x75, 0x6c, 0x6c, 0x4b, 0x76,
+	0x4d, 0x65, 0x74, 0x61, 0x52, 0x65, 0x73, 0x70, 0x22, 0x31, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2b,
+	0x3a, 0x01, 0x2a, 0x22, 0x26, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x65,
+	0x64, 0x2f, 0x62, 0x69, 0x7a, 0x2f, 0x7b, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6b,
+	0x76, 0x73, 0x2f, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x6c, 0x0a, 0x0a, 0x47,
+	0x65, 0x74, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x13, 0x2e, 0x70, 0x62, 0x66, 0x73,
+	0x2e, 0x47, 0x65, 0x74, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x14,
+	0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65,
+	0x52, 0x65, 0x73, 0x70, 0x22, 0x33, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2d, 0x3a, 0x01, 0x2a, 0x22,
+	0x28, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x65, 0x64, 0x2f, 0x62, 0x69,
+	0x7a, 0x2f, 0x7b, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6b, 0x76, 0x73, 0x2f, 0x64,
+	0x61, 0x74, 0x61, 0x2f, 0x7b, 0x6b, 0x65, 0x79, 0x7d, 0x12, 0x33, 0x0a, 0x08, 0x4c, 0x69, 0x73,
+	0x74, 0x41, 0x70, 0x70, 0x73, 0x12, 0x11, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x4c, 0x69, 0x73,
+	0x74, 0x41, 0x70, 0x70, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x12, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e,
+	0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x70, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x42,
+	0x0a, 0x0d, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x12,
+	0x16, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e,
+	0x6c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x71, 0x1a, 0x17, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41,
+	0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x52, 0x65, 0x73, 0x70,
+	0x22, 0x00, 0x12, 0x54, 0x0a, 0x13, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c,
+	0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x1c, 0x2e, 0x70, 0x62, 0x66, 0x73,
+	0x2e, 0x41, 0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x71, 0x1a, 0x1d, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x41,
+	0x73, 0x79, 0x6e, 0x63, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x53, 0x74, 0x61, 0x74,
+	0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x7f, 0x0a, 0x10, 0x47, 0x65, 0x74, 0x53,
+	0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x19, 0x2e, 0x70,
+	0x62, 0x66, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x56,
+	0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x1a, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e, 0x47,
+	0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52,
+	0x65, 0x73, 0x70, 0x22, 0x34, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2e, 0x3a, 0x01, 0x2a, 0x22, 0x29,
+	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x65, 0x64, 0x2f, 0x62, 0x69, 0x7a,
+	0x2f, 0x7b, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6b, 0x76, 0x73, 0x2f, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x2f, 0x7b, 0x6b, 0x65, 0x79, 0x7d, 0x12, 0x80, 0x01, 0x0a, 0x0f, 0x47, 0x65,
+	0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x19, 0x2e,
+	0x70, 0x62, 0x66, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76,
+	0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x19, 0x2e, 0x70, 0x62, 0x66, 0x73, 0x2e,
+	0x47, 0x65, 0x74, 0x53, 0x69, 0x6e, 0x67, 0x6c, 0x65, 0x4b, 0x76, 0x4d, 0x65, 0x74, 0x61, 0x52,
+	0x65, 0x73, 0x70, 0x22, 0x37, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x31, 0x3a, 0x01, 0x2a, 0x22, 0x2c,
+	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x76, 0x31, 0x2f, 0x66, 0x65, 0x65, 0x64, 0x2f, 0x62, 0x69, 0x7a,
+	0x2f, 0x7b, 0x62, 0x69, 0x7a, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x6b, 0x76, 0x73, 0x2f, 0x6d, 0x65,
+	0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2f, 0x7b, 0x6b, 0x65, 0x79, 0x7d, 0x42, 0x57, 0x5a, 0x55,
+	0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x54, 0x65, 0x6e, 0x63, 0x65,
+	0x6e, 0x74, 0x42, 0x6c, 0x75, 0x65, 0x4b, 0x69, 0x6e, 0x67, 0x2f, 0x62, 0x6b, 0x2d, 0x62, 0x63,
+	0x73, 0x2f, 0x62, 0x63, 0x73, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x2f, 0x62,
+	0x63, 0x73, 0x2d, 0x62, 0x73, 0x63, 0x70, 0x2f, 0x70, 0x6b, 0x67, 0x2f, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x66, 0x65, 0x65, 0x64, 0x2d, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72,
+	0x3b, 0x70, 0x62, 0x66, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/bcs-services/bcs-bscp/pkg/protocol/feed-server/feed_server.proto b/bcs-services/bcs-bscp/pkg/protocol/feed-server/feed_server.proto
index 06874846d7..2df7aed515 100644
--- a/bcs-services/bcs-bscp/pkg/protocol/feed-server/feed_server.proto
+++ b/bcs-services/bcs-bscp/pkg/protocol/feed-server/feed_server.proto
@@ -161,8 +161,9 @@ message GetDownloadURLReq {
 }
 
 message GetDownloadURLResp {
-  string url = 1;
-  int64 wait_time_mil = 2;  // the time(milliseconds) that the client should wait before downloading file
+  string url = 1;            // compatible with old versions
+  int64 wait_time_mil = 2;   // the time(milliseconds) that the client should wait before downloading file
+  repeated string urls = 3;  // used for high availability
 }
 
 // App 对外简单版本
diff --git a/bcs-services/bcs-bscp/pkg/space/space.go b/bcs-services/bcs-bscp/pkg/space/space.go
index 190048efb8..cd9990ffef 100644
--- a/bcs-services/bcs-bscp/pkg/space/space.go
+++ b/bcs-services/bcs-bscp/pkg/space/space.go
@@ -143,8 +143,8 @@ func (s *Manager) AllSpaces() []*Space {
 	return s.cachedSpace
 }
 
-// allCMDBSpaces 返回全量CMDB空间
-func (s *Manager) allCMDBSpaces() map[string]struct{} {
+// AllCMDBSpaces 返回全量CMDB空间
+func (s *Manager) AllCMDBSpaces() map[string]struct{} {
 	s.mtx.Lock()
 	defer s.mtx.Unlock()
 
@@ -242,7 +242,7 @@ func BuildSpaceUid(t Type, id string) string {
 
 // HasCMDBSpace checks if cmdb space exists
 func (s *Manager) HasCMDBSpace(spaceId string) bool {
-	if _, ok := s.allCMDBSpaces()[spaceId]; ok {
+	if _, ok := s.AllCMDBSpaces()[spaceId]; ok {
 		return true
 	}
 
@@ -259,7 +259,7 @@ func (s *Manager) HasCMDBSpace(spaceId string) bool {
 	s.requestedCmdbSpaces[spaceId] = struct{}{}
 	s.mtx.Unlock()
 
-	if _, ok := s.allCMDBSpaces()[spaceId]; ok {
+	if _, ok := s.AllCMDBSpaces()[spaceId]; ok {
 		return true
 	}
 	return false
diff --git a/bcs-services/bcs-bscp/pkg/thirdparty/repo/client.go b/bcs-services/bcs-bscp/pkg/thirdparty/repo/client.go
index 8c3e76fada..d354e08d5b 100644
--- a/bcs-services/bcs-bscp/pkg/thirdparty/repo/client.go
+++ b/bcs-services/bcs-bscp/pkg/thirdparty/repo/client.go
@@ -30,7 +30,7 @@ import (
 
 // Client is repo client.
 type Client struct {
-	config cc.Repository
+	config cc.BaseRepo
 	// http client instance
 	client rest.ClientInterface
 	// http header info
@@ -38,7 +38,7 @@ type Client struct {
 }
 
 // NewClient new repo client.
-func NewClient(repoSetting cc.Repository, reg prometheus.Registerer) (*Client, error) {
+func NewClient(repoSetting cc.BaseRepo, reg prometheus.Registerer) (*Client, error) {
 	tls := &tools.TLSConfig{
 		InsecureSkipVerify: repoSetting.BkRepo.TLS.InsecureSkipVerify,
 		CertFile:           repoSetting.BkRepo.TLS.CertFile,
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/api/utils.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/api/utils.go
index b53198f73a..94686c8bb6 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/api/utils.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/api/utils.go
@@ -241,8 +241,8 @@ func MapToAwsTaints(taints []*proto.Taint) []*eks.Taint {
 	for _, v := range taints {
 		key := v.Key
 		value := v.Value
-		effect := v.Effect
-		result = append(result, &eks.Taint{Key: &key, Value: &value, Effect: &effect})
+		result = append(result, &eks.Taint{Key: &key, Value: &value, Effect: aws.String(taintTransEffect(v.Effect))})
+
 	}
 	return result
 }
@@ -308,8 +308,8 @@ func CreateTagSpecs(instanceTags map[string]*string) []*ec2.LaunchTemplateTagSpe
 	}
 }
 
-// generateAwsCreateLaunchTemplateInput generate Aws CreateLaunchTemplateInput
-func generateAwsCreateLaunchTemplateInput(input *CreateLaunchTemplateInput) *ec2.CreateLaunchTemplateInput {
+// generateAwsLaunchTemplateInput generate Aws CreateLaunchTemplateInput
+func generateAwsLaunchTemplateInput(input *CreateLaunchTemplateInput) *ec2.CreateLaunchTemplateInput {
 	awsInput := &ec2.CreateLaunchTemplateInput{
 		LaunchTemplateName: input.LaunchTemplateName,
 		TagSpecifications:  generateAwsTagSpecs(input.TagSpecifications),
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/cloud.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/cloud.go
index 8ce7f04f29..b348cebe9c 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/cloud.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/cloud.go
@@ -14,6 +14,7 @@ package aws
 
 import (
 	"fmt"
+	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/common"
 	"sync"
 
 	"github.com/aws/aws-sdk-go/service/ec2"
@@ -41,6 +42,22 @@ type CloudInfoManager struct {
 // InitCloudClusterDefaultInfo init cluster defaultConfig
 func (c *CloudInfoManager) InitCloudClusterDefaultInfo(cls *cmproto.Cluster,
 	opt *cloudprovider.InitClusterConfigOption) error {
+	// call aws interface to init cluster defaultConfig
+	if c == nil || cls == nil {
+		return fmt.Errorf("%s InitCloudClusterDefaultInfo request is empty", cloudName)
+	}
+
+	if opt == nil || opt.Cloud == nil {
+		return fmt.Errorf("%s InitCloudClusterDefaultInfo option is empty", cloudName)
+	}
+
+	if len(cls.ManageType) == 0 {
+		cls.ManageType = common.ClusterManageTypeIndependent
+	}
+	if len(cls.ClusterCategory) == 0 {
+		cls.ClusterCategory = common.Builder
+	}
+
 	return nil
 }
 
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/nodegroup.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/nodegroup.go
index d88237b84f..c5e6803c0e 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/nodegroup.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/nodegroup.go
@@ -107,10 +107,14 @@ func (ng *NodeGroup) generateUpdateNodegroupConfigInput(group *proto.NodeGroup,
 	input := &eks.UpdateNodegroupConfigInput{
 		ClusterName:   &cluster,
 		NodegroupName: &group.CloudNodeGroupID,
-		Labels: &eks.UpdateLabelsPayload{
-			AddOrUpdateLabels: aws.StringMap(group.Labels),
-		},
 	}
+
+	if len(group.GetNodeTemplate().GetLabels()) > 0 {
+		input.Labels =  &eks.UpdateLabelsPayload{
+			AddOrUpdateLabels: aws.StringMap(group.GetNodeTemplate().GetLabels()),
+		}
+	}
+	
 	if group.AutoScaling != nil {
 		input.ScalingConfig = &eks.NodegroupScalingConfig{
 			MaxSize: aws.Int64(int64(group.AutoScaling.MaxSize)),
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/taskmgr.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/taskmgr.go
index 976b835bfb..d43d30dce3 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/taskmgr.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/taskmgr.go
@@ -14,6 +14,7 @@ package aws
 
 import (
 	"fmt"
+	icommon "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/common"
 	"strconv"
 	"strings"
 	"sync"
@@ -27,7 +28,6 @@ import (
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/common"
 	"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/template"
-	icommon "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/common"
 )
 
 var taskMgr sync.Once
@@ -160,69 +160,76 @@ func (t *Task) BuildCreateClusterTask(cls *proto.Cluster, opt *cloudprovider.Cre
 		createClusterTask.BuildCreateCloudNodeGroupStep(task)
 		// step4: check cluster nodegroups status
 		createClusterTask.BuildCheckCloudNodeGroupStatusStep(task)
-		if desireSize != 0 {
-			// step5: check cluster nodegroups status
-			createClusterTask.BuildCheckClusterNodesStatusStep(task)
-			// step6: update nodes to DB
-			createClusterTask.BuildUpdateNodesToDBStep(task)
-			// step7: install cluster watch component
-			common.BuildWatchComponentTaskStep(task, cls, "")
-			// step8: 若需要则设置节点注解
-			common.BuildNodeAnnotationsTaskStep(task, cls.ClusterID, nil, func() map[string]string {
-				if opt.NodeTemplate != nil && len(opt.NodeTemplate.GetAnnotations()) > 0 {
-					return opt.NodeTemplate.GetAnnotations()
-				}
-				return nil
-			}())
-			// step9 install gse agent
-			common.BuildInstallGseAgentTaskStep(task, &common.GseInstallInfo{
-				ClusterId:          cls.ClusterID,
-				BusinessId:         cls.BusinessID,
-				CloudArea:          cls.GetClusterBasicSettings().GetArea(),
-				User:               nodeGroups[0].GetLaunchTemplate().GetInitLoginUsername(),
-				Passwd:             nodeGroups[0].GetLaunchTemplate().GetInitLoginPassword(),
-				KeyInfo:            nodeGroups[0].GetLaunchTemplate().GetKeyPair(),
-				AllowReviseCloudId: icommon.True,
-			}, cloudprovider.WithStepAllowSkip(true))
-		}
 	}
 
-	// step10: transfer host module
-	moduleID := cls.GetClusterBasicSettings().GetModule().GetWorkerModuleID()
-	if moduleID != "" {
-		common.BuildTransferHostModuleStep(task, cls.BusinessID, cls.GetClusterBasicSettings().GetModule().
-			GetWorkerModuleID(), cls.GetClusterBasicSettings().GetModule().GetMasterModuleID())
-	}
+	if desireSize != 0 {
+		// step5: check cluster nodegroups status
+		createClusterTask.BuildCheckClusterNodesStatusStep(task)
+		// step6: update nodes to DB
+		createClusterTask.BuildUpdateNodesToDBStep(task)
+		// step7: install gse agent
+		common.BuildInstallGseAgentTaskStep(task, &common.GseInstallInfo{
+			ClusterId:          cls.ClusterID,
+			BusinessId:         cls.BusinessID,
+			CloudArea:          cls.GetClusterBasicSettings().GetArea(),
+			User:               nodeGroups[0].GetLaunchTemplate().GetInitLoginUsername(),
+			Passwd:             nodeGroups[0].GetLaunchTemplate().GetInitLoginPassword(),
+			KeyInfo:            nodeGroups[0].GetLaunchTemplate().GetKeyPair(),
+			AllowReviseCloudId: icommon.True,
+		}, cloudprovider.WithStepAllowSkip(true))
+
+		// step8: transfer host module
+		moduleID := cls.GetClusterBasicSettings().GetModule().GetWorkerModuleID()
+		if moduleID != "" {
+			common.BuildTransferHostModuleStep(task, cls.BusinessID, cls.GetClusterBasicSettings().GetModule().
+				GetWorkerModuleID(), cls.GetClusterBasicSettings().GetModule().GetMasterModuleID())
+		}
 
-	// step11: 业务后置自定义流程: 支持标准运维任务 或者 后置脚本
-	if opt.NodeTemplate != nil && len(opt.NodeTemplate.UserScript) > 0 {
-		common.BuildJobExecuteScriptStep(task, common.JobExecParas{
-			ClusterID: cls.ClusterID,
-			Content:   opt.NodeTemplate.UserScript,
-			// dynamic node ips
-			NodeIps:   "",
-			Operator:  opt.Operator,
-			StepName:  common.PostInitStepJob,
-			Translate: common.PostInitJob,
-		})
-	}
-	// business post define sops task or script
-	if opt.NodeTemplate != nil && opt.NodeTemplate.ScaleOutExtraAddons != nil {
-		err := template.BuildSopsFactory{
-			StepName: template.UserAfterInit,
-			Cluster:  cls,
-			Extra: template.ExtraInfo{
+		// step9: 业务后置自定义流程: 支持标准运维任务 或者 后置脚本
+		if len(nodeGroups) > 0 && nodeGroups[0].GetNodeTemplate() != nil &&
+			len(nodeGroups[0].GetNodeTemplate().UserScript) > 0 {
+			common.BuildJobExecuteScriptStep(task, common.JobExecParas{
+				ClusterID: cls.ClusterID,
+				Content:   nodeGroups[0].GetNodeTemplate().UserScript,
 				// dynamic node ips
-				NodeIPList:      "",
-				NodeOperator:    opt.Operator,
-				ShowSopsUrl:     true,
-				TranslateMethod: template.UserPostInit,
-			}}.BuildSopsStep(task, opt.NodeTemplate.ScaleOutExtraAddons, false)
-		if err != nil {
-			return nil, fmt.Errorf("BuildCreateClusterTask business BuildBkSopsStepAction failed: %v", err)
+				NodeIps:   "",
+				Operator:  opt.Operator,
+				StepName:  common.PostInitStepJob,
+				Translate: common.PostInitJob,
+			})
+		}
+		// business post define sops task or script
+		if len(nodeGroups) > 0 && nodeGroups[0].GetNodeTemplate() != nil && nodeGroups[0].GetNodeTemplate().ScaleOutExtraAddons != nil {
+			err := template.BuildSopsFactory{
+				StepName: template.UserAfterInit,
+				Cluster:  cls,
+				Extra: template.ExtraInfo{
+					// dynamic node ips
+					NodeIPList:      "",
+					NodeOperator:    opt.Operator,
+					ShowSopsUrl:     true,
+					TranslateMethod: template.UserPostInit,
+				}}.BuildSopsStep(task, nodeGroups[0].GetNodeTemplate().ScaleOutExtraAddons, false)
+			if err != nil {
+				return nil, fmt.Errorf("BuildCreateClusterTask business BuildBkSopsStepAction failed: %v", err)
+			}
 		}
+
+		// step10: 若需要则设置节点注解
+		common.BuildNodeAnnotationsTaskStep(task, cls.ClusterID, nil, func() map[string]string {
+			if len(nodeGroups) > 0 && len(nodeGroups[0].GetNodeTemplate().GetAnnotations()) > 0 {
+				return nodeGroups[0].GetNodeTemplate().GetAnnotations()
+			}
+			return nil
+		}())
+
+		// step11: remove inner nodes taints
+		common.BuildRemoveInnerTaintTaskStep(task, cls.ClusterID, cls.Provider)
 	}
 
+	// step12: install cluster watch component
+	common.BuildWatchComponentTaskStep(task, cls, "")
+
 	// set current step
 	if len(task.StepSequence) == 0 {
 		return nil, fmt.Errorf("BuildCreateClusterTask task StepSequence empty")
@@ -698,7 +705,7 @@ func (t *Task) BuildUpdateDesiredNodesTask(desired uint32, group *proto.NodeGrou
 	common.BuildNodeAnnotationsTaskStep(task, opt.Cluster.ClusterID, nil,
 		cloudprovider.GetAnnotationsByNg(opt.NodeGroup))
 	// step8: remove inner nodes taints
-	common.BuildRemoveInnerTaintTaskStep(task, group)
+	common.BuildRemoveInnerTaintTaskStep(task, group.ClusterID, group.Provider)
 
 	// set current step
 	if len(task.StepSequence) == 0 {
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/createCluster.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/createCluster.go
index b19b2d5f8f..4f2172bcfc 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/createCluster.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/createCluster.go
@@ -104,35 +104,45 @@ func CreateEKSClusterTask(taskID string, stepName string) error {
 	return nil
 }
 
+// createEKSCluster 创建一个Amazon EKS集群，并更新集群信息。
 func createEKSCluster(ctx context.Context, info *cloudprovider.CloudDependBasicInfo) (
 	string, error) {
+	// 从上下文中获取任务ID
 	taskID := cloudprovider.GetTaskIDFromContext(ctx)
 	cluster := info.Cluster
 
+	// 创建一个新的AWS客户端集
 	client, err := api.NewAWSClientSet(info.CmOption)
 	if err != nil {
 		return "", fmt.Errorf("create eksService failed")
 	}
 
+	// 获取IAM角色信息
 	role, err := client.GetRole(&iam.GetRoleInput{RoleName: aws.String(cluster.GetClusterIamRole())})
 	if err != nil {
+		// 如果获取角色失败，记录错误日志并返回错误
 		blog.Errorf("GetRole[%s] failed, %v", taskID, err)
 		return "", err
 	}
 
+	// generateCreateClusterInput 生成创建集群的输入参数
 	input, err := generateCreateClusterInput(info, role.Arn)
 	if err != nil {
+		// 如果生成输入参数失败，返回错误
 		return "", fmt.Errorf("generateCreateClusterInput failed, %v", err)
 	}
 
+	// CreateEksCluster 调用API创建EKS集群
 	eksCluster, err := client.CreateEksCluster(input)
 	if err != nil {
+		// 如果创建集群失败，返回错误
 		return "", fmt.Errorf("call CreateEksCluster failed, %v", err)
 	}
 
 	info.Cluster.SystemID = *eksCluster.Name
 	info.Cluster.VpcID = *eksCluster.ResourcesVpcConfig.VpcId
 
+	// 更新集群信息
 	err = cloudprovider.UpdateCluster(info.Cluster)
 	if err != nil {
 		blog.Errorf("createEKSCluster[%s] UpdateCluster[%s] failed %s",
@@ -146,12 +156,13 @@ func createEKSCluster(ctx context.Context, info *cloudprovider.CloudDependBasicI
 	return *eksCluster.Name, nil
 }
 
+// generateCreateClusterInput 根据提供的云提供商基本信息和角色ARN生成创建EKS集群的输入参数
 func generateCreateClusterInput(info *cloudprovider.CloudDependBasicInfo, roleArn *string) (
 	*eks.CreateClusterInput, error) {
 
 	var (
-		cluster   = info.Cluster
-		subnetIds = make([]string, 0)
+		cluster   = info.Cluster      // 获取集群信息
+		subnetIds = make([]string, 0) // 初始化子网ID切片
 		err       error
 	)
 
@@ -164,25 +175,28 @@ func generateCreateClusterInput(info *cloudprovider.CloudDependBasicInfo, roleAr
 		if len(info.Cluster.GetNetworkSettings().GetSubnetSource().GetExisted().GetIds()) > 0 {
 			subnetIds = append(subnetIds, info.Cluster.GetNetworkSettings().GetSubnetSource().GetExisted().GetIds()...)
 		}
-	} else {
-		subnetIds = strings.Split(cluster.ClusterBasicSettings.SubnetID, ",")
 	}
+	// 如果subnetIds为空，则返回错误
+	if len(subnetIds) == 0 {
+		return nil, errors.New("generateCreateClusterInput subnetIds is empty")
+	}
+	info.Cluster.NetworkSettings.EniSubnetIDs = subnetIds
 
 	sgs := strings.Split(cluster.ClusterAdvanceSettings.ClusterConnectSetting.SecurityGroup, ",")
 	input := &eks.CreateClusterInput{
-		// 默认启用集群访问权限,认证模式为
 		AccessConfig: &eks.CreateAccessConfigRequest{
-			AuthenticationMode:                      aws.String(api.ClusterAuthenticationModeAM),
-			BootstrapClusterCreatorAdminPermissions: aws.Bool(true),
+			AuthenticationMode:                      aws.String(api.ClusterAuthenticationModeAM), // 设置认证模式
+			BootstrapClusterCreatorAdminPermissions: aws.Bool(true),                              // 默认启用集群创建者管理员权限
 		},
-		Name:    aws.String(cluster.ClusterName),
-		RoleArn: roleArn,
+		Name:    aws.String(cluster.ClusterName), // 设置集群名称
+		RoleArn: roleArn,                         // 设置角色ARN
 		ResourcesVpcConfig: &eks.VpcConfigRequest{
-			SubnetIds:             aws.StringSlice(subnetIds),
-			SecurityGroupIds:      aws.StringSlice(sgs),
-			EndpointPrivateAccess: aws.Bool(!cluster.ClusterAdvanceSettings.ClusterConnectSetting.IsExtranet),
-			EndpointPublicAccess:  aws.Bool(cluster.ClusterAdvanceSettings.ClusterConnectSetting.IsExtranet),
+			SubnetIds:             aws.StringSlice(subnetIds),                                                 // 设置子网ID
+			SecurityGroupIds:      aws.StringSlice(sgs),                                                       // 设置安全组ID
+			EndpointPrivateAccess: aws.Bool(!cluster.ClusterAdvanceSettings.ClusterConnectSetting.IsExtranet), // 设置私有访问端点
+			EndpointPublicAccess:  aws.Bool(cluster.ClusterAdvanceSettings.ClusterConnectSetting.IsExtranet),  // 设置公共访问端点
 			PublicAccessCidrs: func() []*string {
+				// 如果集群的网络设置中的公共访问CIDR存在，则返回对应的切片，否则返回nil
 				if cluster.ClusterAdvanceSettings.ClusterConnectSetting.Internet == nil ||
 					cluster.ClusterAdvanceSettings.ClusterConnectSetting.Internet.PublicAccessCidrs == nil {
 					return nil
@@ -191,17 +205,19 @@ func generateCreateClusterInput(info *cloudprovider.CloudDependBasicInfo, roleAr
 			}(),
 		},
 		UpgradePolicy: func(setting *proto.ClusterBasicSetting) *eks.UpgradePolicyRequest {
+			// 如果升级策略未设置，则默认使用EXTENDED策略
 			if setting.UpgradePolicy == nil {
-				// 默认使用EXTENDED升级策略, 与aws保持一致
 				return &eks.UpgradePolicyRequest{SupportType: aws.String(api.ClusterUpdatePolicyExtended)}
 			}
+			// 如果升级策略不是EXTENDED或STANDARD，则使用EXTENDED策略
 			if setting.UpgradePolicy.SupportType != api.ClusterUpdatePolicyExtended &&
 				setting.UpgradePolicy.SupportType != api.ClusterUpdatePolicyStandard {
 				return &eks.UpgradePolicyRequest{SupportType: aws.String(api.ClusterUpdatePolicyExtended)}
 			}
+			// 否则使用设置的升级策略
 			return &eks.UpgradePolicyRequest{SupportType: aws.String(setting.UpgradePolicy.SupportType)}
 		}(cluster.ClusterBasicSettings),
-		Version: aws.String(cluster.ClusterBasicSettings.Version),
+		Version: aws.String(cluster.ClusterBasicSettings.Version), // 设置Kubernetes版本
 	}
 	input.KubernetesNetworkConfig = generateKubernetesNetworkConfig(cluster)
 	if len(cluster.ClusterBasicSettings.ClusterTags) > 0 {
@@ -211,6 +227,7 @@ func generateCreateClusterInput(info *cloudprovider.CloudDependBasicInfo, roleAr
 	return input, nil
 }
 
+// generateKubernetesNetworkConfig network config
 func generateKubernetesNetworkConfig(cluster *proto.Cluster) *eks.KubernetesNetworkConfigRequest {
 	req := &eks.KubernetesNetworkConfigRequest{}
 	if cluster != nil && cluster.NetworkSettings != nil {
@@ -345,10 +362,12 @@ func checkClusterStatus(ctx context.Context, info *cloudprovider.CloudDependBasi
 	return nil
 }
 
+// createAddon 函数用于在AWS EKS集群上创建默认的addons。
 func createAddon(ctx context.Context, info *cloudprovider.CloudDependBasicInfo) error {
+	// 从上下文中获取任务ID，用于日志记录
 	taskID := cloudprovider.GetTaskIDFromContext(ctx)
 
-	// get awsCloud client
+	// 初始化AWS EKS客户端
 	cli, err := api.NewEksClient(info.CmOption)
 	if err != nil {
 		blog.Errorf("checkClusterStatus[%s] get aws client failed: %s", taskID, err.Error())
@@ -356,11 +375,14 @@ func createAddon(ctx context.Context, info *cloudprovider.CloudDependBasicInfo)
 		return retErr
 	}
 
+	// 遍历默认的addons列表
 	for _, addon := range defaultAddons {
+		// 调用CreateAddon方法创建addon
 		_, err = cli.CreateAddon(&eks.CreateAddonInput{
-			ClusterName: aws.String(info.Cluster.ClusterName),
-			AddonName:   aws.String(addon),
+			ClusterName: aws.String(info.Cluster.ClusterName), // 设置集群名称
+			AddonName:   aws.String(addon),                    // 设置要创建的addon名称
 		})
+		// 如果创建addon失败，则直接返回错误
 		if err != nil {
 			return err
 		}
@@ -551,10 +573,10 @@ func checkClusterNodesStatus(ctx context.Context, info *cloudprovider.CloudDepen
 	if errors.Is(err, context.DeadlineExceeded) {
 		running, failure := make([]string, 0), make([]string, 0)
 
-		nodes, err := k8sOperator.ListClusterNodes(context.Background(), info.Cluster.ClusterID) // nolint
-		if err != nil {
+		nodes, errLocal := k8sOperator.ListClusterNodes(context.Background(), info.Cluster.ClusterID) // nolint
+		if errLocal != nil {
 			blog.Errorf("checkClusterNodesStatus[%s] cluster[%s] failed: %v", taskID, info.Cluster.ClusterID, err)
-			return nil, nil, err
+			return nil, nil, errLocal
 		}
 
 		for _, ins := range nodes {
@@ -620,9 +642,6 @@ func UpdateEKSNodesToDBTask(taskID string, stepName string) error {
 		return retErr
 	}
 
-	// sync clusterData to pass-cc
-	providerutils.SyncClusterInfoToPassCC(taskID, dependInfo.Cluster)
-
 	// sync cluster perms
 	providerutils.AuthClusterResourceCreatorPerm(ctx, dependInfo.Cluster.ClusterID,
 		dependInfo.Cluster.ClusterName, dependInfo.Cluster.Creator)
@@ -643,7 +662,7 @@ func updateNodeToDB(ctx context.Context, state *cloudprovider.TaskState, info *c
 	addSuccessNodes := state.Task.CommonParams[cloudprovider.SuccessClusterNodeIDsKey.String()]
 	addFailureNodes := state.Task.CommonParams[cloudprovider.FailedClusterNodeIDsKey.String()]
 
-	nodeIPs, instanceIDs := make([]string, 0), make([]string, 0)
+	nodeIPs, instanceIDs, nodeNames := make([]string, 0), make([]string, 0), make([]string, 0)
 	nmClient := api.NodeManager{}
 	nodes := make([]*proto.Node, 0)
 
@@ -685,6 +704,7 @@ func updateNodeToDB(ctx context.Context, state *cloudprovider.TaskState, info *c
 			if utils.StringInSlice(n.NodeID, successInstanceID) {
 				n.Status = common.StatusRunning
 				nodeIPs = append(nodeIPs, n.InnerIP)
+				nodeNames = append(nodeNames, n.GetNodeName())
 			} else {
 				n.Status = common.StatusAddNodesFailed
 			}
@@ -696,6 +716,9 @@ func updateNodeToDB(ctx context.Context, state *cloudprovider.TaskState, info *c
 		}
 	}
 	state.Task.CommonParams[cloudprovider.NodeIPsKey.String()] = strings.Join(nodeIPs, ",")
+	state.Task.CommonParams[cloudprovider.NodeNamesKey.String()] = strings.Join(nodeNames, ",")
+	// dynamic inject paras
+	state.Task.CommonParams[cloudprovider.DynamicNodeIPListKey.String()] = strings.Join(nodeIPs, ",")
 
 	return nil
 }
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/createNodeGroup.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/createNodeGroup.go
index c3a06ab668..1793830407 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/createNodeGroup.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/createNodeGroup.go
@@ -191,13 +191,13 @@ func generateCreateNodegroupInput(group *proto.NodeGroup, cluster *proto.Cluster
 		nodeGroup.CapacityType != aws.String(eks.CapacityTypesSpot) {
 		nodeGroup.CapacityType = aws.String(eks.CapacityTypesOnDemand)
 	}
-	if len(group.Labels) != 0 {
-		nodeGroup.Labels = aws.StringMap(group.Labels)
+	if group.NodeTemplate != nil && len(group.NodeTemplate.Labels) > 0 {
+		nodeGroup.Labels = aws.StringMap(group.NodeTemplate.Labels)
 	}
 	if len(group.Tags) != 0 {
 		nodeGroup.Tags = aws.StringMap(group.Tags)
 	}
-	if group.NodeTemplate != nil {
+	if group.NodeTemplate != nil && len(group.NodeTemplate.Taints) > 0 {
 		nodeGroup.Taints = api.MapToTaints(group.NodeTemplate.Taints)
 	}
 
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/deleteCluster.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/deleteCluster.go
index c7d638cedf..6d4055cce9 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/deleteCluster.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/deleteCluster.go
@@ -15,6 +15,7 @@ package tasks
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
 	"github.com/Tencent/bk-bcs/bcs-common/common/blog"
@@ -73,6 +74,11 @@ func DeleteEKSClusterTask(taskID string, stepName string) error {
 func deleteEKSCluster(ctx context.Context, info *cloudprovider.CloudDependBasicInfo) error {
 	taskID := cloudprovider.GetTaskIDFromContext(ctx)
 	cluster := info.Cluster
+
+	if cluster.GetSystemID() == "" {
+		return nil
+	}
+
 	// get aws client
 	cli, err := api.NewEksClient(info.CmOption)
 	if err != nil {
@@ -81,13 +87,21 @@ func deleteEKSCluster(ctx context.Context, info *cloudprovider.CloudDependBasicI
 		return fmt.Errorf("get aws client failed, %s", err.Error())
 	}
 
+	// check cluster if exist
+	_, err = cli.GetEksCluster(cluster.SystemID)
+	if err != nil {
+		if strings.Contains(err.Error(), eks.ErrCodeResourceNotFoundException){
+			return nil
+		}
+		return err
+	}
+
+	// check cluster if node group exist, and batch delete nodegroups first, or the cluster can't be deleted
 	ngList, err := cli.ListNodegroups(cluster.SystemID)
 	if err != nil {
 		blog.Errorf("deleteEKSCluster[%s]: call aws ListNodegroups failed: %v", taskID, err)
 		return fmt.Errorf("call aws ListNodegroups failed: %s", err.Error())
 	}
-
-	// delete nodegroups first, or the cluster can't be deleted
 	for _, ng := range ngList {
 		err = retry.Do(func() error {
 			_, err = cli.DeleteNodegroup(&eks.DeleteNodegroupInput{
@@ -126,6 +140,7 @@ func deleteEKSCluster(ctx context.Context, info *cloudprovider.CloudDependBasicI
 		return err
 	}
 
+	// delete cluster
 	_, err = cli.DeleteEksCluster(cluster.SystemID)
 	if err != nil {
 		blog.Errorf("deleteEKSCluster[%s]: call aws DeleteEKSCluster failed: %v", taskID, err)
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/common/taint.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/common/taint.go
index 77728bc19a..4fe2a0aaa6 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/common/taint.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/common/taint.go
@@ -48,12 +48,11 @@ var (
 // BuildRemoveInnerTaintTaskStep 删除预置的污点
 // NOCC:tosa/fn_length(忽略)
 // nolint function name should not exceed 35 characters
-func BuildRemoveInnerTaintTaskStep(task *proto.Task, group *proto.NodeGroup) {
+func BuildRemoveInnerTaintTaskStep(task *proto.Task, clusterId, provider string) {
 	removeTaintStep := cloudprovider.InitTaskStep(RemoveClusterNodesInnerTaintStep)
 
-	removeTaintStep.Params[cloudprovider.ClusterIDKey.String()] = group.ClusterID
-	removeTaintStep.Params[cloudprovider.NodeGroupIDKey.String()] = group.NodeGroupID
-	removeTaintStep.Params[cloudprovider.CloudIDKey.String()] = group.Provider
+	removeTaintStep.Params[cloudprovider.ClusterIDKey.String()] = clusterId
+	removeTaintStep.Params[cloudprovider.CloudIDKey.String()] = provider
 
 	task.Steps[RemoveClusterNodesInnerTaintStep.StepMethod] = removeTaintStep
 	task.StepSequence = append(task.StepSequence, RemoveClusterNodesInnerTaintStep.StepMethod)
@@ -80,22 +79,21 @@ func RemoveClusterNodesInnerTaintTask(taskID string, stepName string) error {
 	// step login started here
 	// extract parameter && check validate
 	clusterID := step.Params[cloudprovider.ClusterIDKey.String()]
-	nodeGroupID := step.Params[cloudprovider.NodeGroupIDKey.String()]
 	cloudID := step.Params[cloudprovider.CloudIDKey.String()]
 	// inject success nodesNames
 	nodeNames := strings.Split(state.Task.CommonParams[cloudprovider.NodeNamesKey.String()], ",")
-	removeTaints := strings.Split(state.Task.CommonParams[cloudprovider.RemoveTaintsKey.String()], ",")
+	removeTaints := cloudprovider.ParseNodeIpOrIdFromCommonMap(state.Task.CommonParams,
+		cloudprovider.RemoveTaintsKey.String(), ",")
 
-	if len(clusterID) == 0 || len(nodeGroupID) == 0 || len(cloudID) == 0 || len(nodeNames) == 0 {
+	if len(clusterID) == 0 || len(cloudID) == 0 || len(nodeNames) == 0 {
 		blog.Errorf("RemoveClusterNodesTaintTask[%s]: check parameter validate failed", taskID)
 		retErr := fmt.Errorf("RemoveClusterNodesTaintTask check parameters failed")
 		_ = state.UpdateStepFailure(start, stepName, retErr)
 		return retErr
 	}
 	dependInfo, err := cloudprovider.GetClusterDependBasicInfo(cloudprovider.GetBasicInfoReq{
-		ClusterID:   clusterID,
-		CloudID:     cloudID,
-		NodeGroupID: nodeGroupID,
+		ClusterID: clusterID,
+		CloudID:   cloudID,
 	})
 	if err != nil {
 		blog.Errorf("RemoveClusterNodesTaintTask[%s]: GetClusterDependBasicInfo failed: %s", taskID, err.Error())
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/google/taskmgr.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/google/taskmgr.go
index 96039c0f7c..80fa27d47d 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/google/taskmgr.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/google/taskmgr.go
@@ -596,7 +596,7 @@ func (t *Task) BuildUpdateDesiredNodesTask(desired uint32, group *proto.NodeGrou
 		cloudprovider.GetAnnotationsByNg(opt.NodeGroup))
 
 	// step5: remove inner nodes taints
-	common.BuildRemoveInnerTaintTaskStep(task, group)
+	common.BuildRemoveInnerTaintTaskStep(task, group.ClusterID, group.Provider)
 
 	// set current step
 	if len(task.StepSequence) == 0 {
diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/huawei/taskmgr.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/huawei/taskmgr.go
index 628f3394ff..17257207fb 100644
--- a/bcs-services/bcs-cluster-manager/internal/cloudprovider/huawei/taskmgr.go
+++ b/bcs-services/bcs-cluster-manager/internal/cloudprovider/huawei/taskmgr.go
@@ -780,7 +780,7 @@ func (t *Task) BuildUpdateDesiredNodesTask(desired uint32, group *proto.NodeGrou
 		cloudprovider.GetAnnotationsByNg(opt.NodeGroup))
 
 	// step6: remove inner nodes taints
-	common.BuildRemoveInnerTaintTaskStep(task, group)
+	common.BuildRemoveInnerTaintTaskStep(task, group.ClusterID, group.Provider)
 
 	// set current step
 	if len(task.StepSequence) == 0 {
diff --git a/bcs-ui/frontend/src/api/modules/cluster-manager.ts b/bcs-ui/frontend/src/api/modules/cluster-manager.ts
index d60f6eb935..ffa3cba68c 100644
--- a/bcs-ui/frontend/src/api/modules/cluster-manager.ts
+++ b/bcs-ui/frontend/src/api/modules/cluster-manager.ts
@@ -66,6 +66,8 @@ export const cloudInstanceTypes = request('get', '/clouds/$cloudId/instancetypes
 export const cloudInstanceTypesByLevel = request('get', '/clouds/$cloudId/regions/$region/clusterlevels/$level/instancetypes');
 export const cloudCidrconflict = request('get', '/clouds/$cloudId/vpcs/$vpc/cidrconflict');
 export const addSubnets = request('post', '/clusters/$clusterId/subnets');
+export const cloudRoles = request('get', '/clouds/$cloudId/serviceroles');
+export const recommendNodeGroupConf = request('get', '/cloud/$cloudId/recommendNodeGroupConf');
 
 // node 操作
 export const getK8sNodes = request('get', '/cluster/$clusterId/node');
diff --git a/bcs-ui/frontend/src/common/constant.ts b/bcs-ui/frontend/src/common/constant.ts
index 3e068ca00d..1d9dd92cb0 100644
--- a/bcs-ui/frontend/src/common/constant.ts
+++ b/bcs-ui/frontend/src/common/constant.ts
@@ -24,6 +24,7 @@ export const TAINT_VALUE = '^([A-Za-z0-9]([-A-Za-z0-9_.]{0,61}[A-Za-z0-9])?)?$';
 export const NAME_REGEX = '^[0-9a-zA-Z-]+$';
 export const SECRET_REGEX = '^[0-9a-zA-Z-~]+$';
 export const SECRETKEY_REGEX = '^[0-9a-zA-Z/-]+$';
+export const CLUSTER_NAME_REGEX = '^[0-9A-Za-z][A-Za-z0-9-_]*';
 
 // 集群环境
 export const CLUSTER_ENV = {
diff --git a/bcs-ui/frontend/src/components/cluster-selector/cluster-select-popover.vue b/bcs-ui/frontend/src/components/cluster-selector/cluster-select-popover.vue
index 4192c7779f..fbd11cce79 100644
--- a/bcs-ui/frontend/src/components/cluster-selector/cluster-select-popover.vue
+++ b/bcs-ui/frontend/src/components/cluster-selector/cluster-select-popover.vue
@@ -31,6 +31,8 @@
           <li
             v-for="cluster in item.list"
             :key="cluster.clusterID"
+            :id="cluster.clusterID"
+            ref="clusterIdRef"
             :class="[
               'flex items-center justify-between px-[40px]',
               normalStatusList.includes(cluster.status || '')
@@ -73,7 +75,7 @@
 </template>
 <script lang="ts" setup>
 // popover场景的集群选择器
-import { PropType, ref } from 'vue';
+import { PropType, ref, watch } from 'vue';
 
 import CollapseTitle from './collapse-title.vue';
 import useClusterSelector, { ClusterType } from './use-cluster-selector';
@@ -100,6 +102,11 @@ const props = defineProps({
     type: Boolean,
     default: true,
   },
+  // 是否展示选中的样式
+  isShow: {
+    type: Boolean,
+    default: false,
+  },
 });
 
 const emits = defineEmits(['change', 'click']);
@@ -107,6 +114,7 @@ const emits = defineEmits(['change', 'click']);
 const normalStatusList = ['RUNNING'];
 
 const hoverClusterID = ref<string>();
+const clusterIdRef = ref<any>([]);
 const {
   keyword,
   localValue,
@@ -124,4 +132,14 @@ const handleClick = (cluster) => {
 
   emits('click', cluster.clusterID);
 };
+watch(() => props.isShow, (val) => {
+  if(val) {
+    // 如果已选择集群，滚动到活动项目
+    const selectedClusterId = localValue.value;
+    if (selectedClusterId) {
+      clusterIdRef.value?.find(item => item.id === selectedClusterId).scrollIntoView({ behavior: 'smooth', block: 'center' });
+    }
+  }
+  
+});
 </script>
diff --git a/bcs-ui/frontend/src/components/combination-input.vue b/bcs-ui/frontend/src/components/combination-input.vue
new file mode 100644
index 0000000000..ba7256e5a1
--- /dev/null
+++ b/bcs-ui/frontend/src/components/combination-input.vue
@@ -0,0 +1,251 @@
+<template>
+  <div class="key-value">
+    <template v-if="keyValueData.length">
+      <div class="key-value-item" v-if="showHeader">
+        <slot name="label">
+          <span class="font-500">{{$t('cluster.create.aws.cidrWhitelist')}}</span>
+        </slot>
+      </div>
+      <div
+        v-for="(item, index) in keyValueData"
+        :key="index"
+        class="key-value-item"
+      >
+        <Validate
+          class="key"
+          :rules="rules"
+          :value="item.key"
+          :meta="index"
+          :required="keyRequired"
+          ref="validateRefs">
+          <bcs-input
+            :placeholder="$t(placeHolder)"
+            :disabled="item.disabled"
+            v-model="item.key">
+          </bcs-input>
+        </Validate>
+        <template v-if="showOperate">
+          <i class="bk-icon icon-plus-circle ml10 mr5" @click="handleAddKeyValue(index)"></i>
+          <i
+            :class="['bk-icon icon-minus-circle', { disabled: disabledDelete }]"
+            @click="handleDeleteKeyValue(index)"
+          ></i>
+        </template>
+      </div>
+    </template>
+    <span
+      class="add-btn mb15"
+      v-else
+      @click="handleAddKeyValue(-1)">
+      <i class="bk-icon icon-plus-circle-shape mr5"></i>
+      {{$t('generic.button.add')}}
+    </span>
+  </div>
+</template>
+<script lang="ts">
+import { computed, defineComponent, onMounted, PropType, ref, toRefs, watch } from 'vue';
+
+import Validate from './validate.vue';
+
+import $i18n from '@/i18n/i18n-setup';
+
+export interface IData {
+  key: string;
+  placeholder?: any;
+  disabled?: boolean;
+}
+export interface IAdvice {
+  desc: string
+  name: string
+}
+export interface IRule {
+  message: any
+  validator: any
+}
+export default defineComponent({
+  components: { Validate },
+  props: {
+    list: {
+      type: Array as PropType<Array<IData>>,
+      default: () => [],
+    },
+    showHeader: {
+      type: Boolean,
+      default: true,
+    },
+    keyRules: {
+      type: Array as PropType<Array<IRule>>,
+      default: () => [],
+    },
+    minItems: {
+      type: Number,
+      default: 1,
+    },
+    uniqueKey: {
+      type: Boolean,
+      default: true,
+    },
+    showOperate: {
+      type: Boolean,
+      default: true,
+    },
+    keyRequired: {
+      type: Boolean,
+      default: false,
+    },
+    placeHolder: {
+      type: String,
+      default: 'generic.placeholder.input',
+    },
+  },
+  setup(props, ctx) {
+    const { keyRules, minItems, uniqueKey } = toRefs(props);
+    const keyValueData = ref<IData[]>([]);
+    const disabledDelete = computed(() => keyValueData.value.length <= minItems.value);
+    // watch(modelValue, () => {
+    //   if (Array.isArray(modelValue.value)) {
+    //     keyValueData.value = modelValue.value.map((item: any) => ({
+    //       ...item,
+    //       disabled: true,
+    //     }));
+    //   } else {
+    //     keyValueData.value = Object.keys(modelValue.value).map(key => ({
+    //       key,
+    //       value: modelValue.value[key],
+    //       disabled: true,
+    //     }));
+    //   }
+    //   // 添加一组空值
+    //   if (!keyValueData.value.length && minItems.value) {
+    //     keyValueData.value.push({
+    //       key: '',
+    //     });
+    //   }
+    // }, { immediate: true });
+    if (!keyValueData.value.length && minItems.value) {
+      keyValueData.value.push({
+        key: '',
+      });
+    }
+    watch(keyValueData, () => {
+      ctx.emit('data-change', keyValueData.value);
+    }, { deep: true });
+
+    const handleAddKeyValue = (index) => {
+      keyValueData.value.splice(index + 1, 0, {
+        key: '',
+      });
+    };
+    const handleDeleteKeyValue = (index) => {
+      if (disabledDelete.value) return;
+      keyValueData.value.splice(index, 1);
+    };
+    const labels = computed(() => keyValueData.value.filter(item => !!item.key).reduce((pre, curLabelItem) => {
+      pre[curLabelItem.key] = curLabelItem.key;
+      return pre;
+    }, {}));
+    // key联想功能
+    const handleAdvice = (advice, item) => {
+      item.key = advice.name;
+      item.value = advice.default;
+    };
+    const rules = ref<IRule[]>([
+      ...keyRules.value,
+    ]);
+    // 数据校验
+    const validate = () => {
+      const keys: string[] = [];
+      keyValueData.value.forEach((item) => {
+        keys.push(item.key);
+      });
+      if (uniqueKey.value) {
+        const removeDuplicateData = new Set(keys);
+        if (keys.length !== removeDuplicateData.size) {
+          return false;
+        }
+      }
+      return keys.every(key => keyRules.value.every(rule => new RegExp(rule.validator).test(key)));
+    };
+    // 组件校验（调用validate组件的方法）
+    const validateRefs = ref<any[]>([]);
+    const validateAll = async () => {
+      const data = validateRefs.value.map($ref => $ref?.validate('blur'));
+      const results = await Promise.all(data);
+      return results.every(result => result);
+    };
+
+    onMounted(() => {
+      if (uniqueKey.value) {
+        rules.value.push({
+          message: $i18n.t('generic.validate.repeatKey'),
+          validator: (value, index) => keyValueData.value.filter((_, i) => i !== index).every(d => d.key !== value),
+        });
+      }
+    });
+
+    return {
+      disabledDelete,
+      rules,
+      labels,
+      keyValueData,
+      validate,
+      validateRefs,
+      validateAll,
+      handleAddKeyValue,
+      handleDeleteKeyValue,
+      handleAdvice,
+    };
+  },
+});
+</script>
+<style lang="postcss" scoped>
+.add-btn {
+  cursor: pointer;
+  background: #fff;
+  border: 1px dashed #c4c6cc;
+  border-radius: 2px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 32px;
+  font-size: 14px;
+  &:hover {
+      border-color: #3a84ff;
+      color: #3a84ff;
+  }
+}
+.key-value-item {
+  display: flex;
+  align-items: center;
+  height: 32px;
+  line-height: 32px;
+  margin-bottom: 10px;
+  font-size: 14px;
+  .key {
+      flex: 1;
+  }
+  .value {
+      flex: 1;
+  }
+  .desc {
+      display: flex;
+      align-items: center;
+  }
+  .bk-icon {
+      font-size: 24px;
+      color: #979bA5;
+      cursor: pointer;
+  }
+  .bk-icon.disabled {
+      color: #DCDEE5;
+      cursor: not-allowed;
+  }
+  .equals-sign {
+      color: #c3cdd7;
+      margin: 0 15px;
+  }
+}
+.bcs-btn {
+  width: 86px;
+}
+</style>
diff --git a/bcs-ui/frontend/src/components/ip-selector/ip-selector.vue b/bcs-ui/frontend/src/components/ip-selector/ip-selector.vue
index 092723d8e9..0f6225f45a 100644
--- a/bcs-ui/frontend/src/components/ip-selector/ip-selector.vue
+++ b/bcs-ui/frontend/src/components/ip-selector/ip-selector.vue
@@ -130,6 +130,9 @@ const getRegionName = (region) => {
 const $biz = computed(() => $store.state.curProject.businessID);
 const $scope = 'biz';
 
+// 是否显示不可用主机
+const isHostOnlyValid = ref(false);
+
 // 获取主机云和占有信息
 const handleGetHostAvailableAndCloudInfo = async (hostData: IHostData[]) => {
   const ipList = hostData.filter(item => !!item.ip).map(item => item.ip);
@@ -159,11 +162,13 @@ const handleGetHostAvailableAndCloudInfo = async (hostData: IHostData[]) => {
   }
 };
 // 获取topo树当前页的主机列表
-const fetchTopologyHostsNodes = async (params) => {
+const fetchTopologyHostsNodes = async (params, hostOnlyValid) => {
+  isHostOnlyValid.value = hostOnlyValid;
   const data: {data: IHostData[]} = await topologyHostsNodes({
     ...params,
     $biz: $biz.value,
     $scope,
+    showAvailableNode: hostOnlyValid,
   }).catch(() => []);
   await handleGetHostAvailableAndCloudInfo(data.data);
   return topologyHostsNodesAdapter(data);
@@ -174,6 +179,7 @@ const fetchHostCheck = async (params) => {
     ...params,
     $biz: $biz.value,
     $scope,
+    showAvailableNode: isHostOnlyValid.value, // todo 手动输入IP场景切换 "仅显示可用" 不会触发fetchHostCheck函数
   }).catch(() => []);
   await handleGetHostAvailableAndCloudInfo(data);
   return hostCheckAdapter(data);
diff --git a/bcs-ui/frontend/src/components/ip-selector/ipv6-selector.ts b/bcs-ui/frontend/src/components/ip-selector/ipv6-selector.ts
index 6d485aa194..6b783efb16 100644
--- a/bcs-ui/frontend/src/components/ip-selector/ipv6-selector.ts
+++ b/bcs-ui/frontend/src/components/ip-selector/ipv6-selector.ts
@@ -89,6 +89,7 @@ const IpSelector = createFactory({
   nameStyle: 'camelCase',
   // 主机列表全选模式，false: 本页全选；true: 跨页全选
   hostTableDefaultSelectAllMode: false,
+  hostOnlyValid: true,
   // 自定义主机列表列
   hostTableCustomColumnList: [
     // {
diff --git a/bcs-ui/frontend/src/components/monaco-editor/ai-editor.vue b/bcs-ui/frontend/src/components/monaco-editor/ai-editor.vue
new file mode 100644
index 0000000000..b092eef87f
--- /dev/null
+++ b/bcs-ui/frontend/src/components/monaco-editor/ai-editor.vue
@@ -0,0 +1,152 @@
+<template>
+  <div :class="height" class="flex items-center overflow-hidden" ref="contentRef">
+    <div
+      :class="[
+        'flex flex-col',
+        'shadow-[0_2px_4px_0_rgba(0,0,0,0.16)]',
+        'flex-1 w-0 bg-[#2E2E2E] h-full rounded-t-sm'
+      ]">
+      <!-- 工具栏 -->
+      <div
+        :class="[
+          'flex items-center justify-between pl-[24px] pr-[16px] h-[40px]',
+          'border-b-[1px] border-solid border-[#000]'
+        ]">
+        <span class="text-[#C4C6CC] text-[14px]"></span>
+        <span class="flex items-center text-[12px] gap-[20px] text-[#979BA5]">
+          <AiAssistant ref="assistantRef" />
+          <i
+            :class="[
+              'hover:text-[#699df4] cursor-pointer',
+              isFullscreen ? 'bcs-icon bcs-icon-zoom-out' : 'bcs-icon bcs-icon-enlarge'
+            ]"
+            @click="switchFullScreen">
+          </i>
+        </span>
+      </div>
+      <!-- 代码编辑器 -->
+      <bcs-resize-layout
+        placement="bottom"
+        :border="false"
+        :auto-minimize="true"
+        :initial-divide="editorErr.message ? 100 : 0"
+        :max="300"
+        :min="100"
+        :disabled="!editorErr.message"
+        class="!h-0 flex-1 file-editor">
+        <template #aside>
+          <EditorStatus
+            :message="editorErr.message"
+            v-show="!!editorErr.message" />
+        </template>
+        <template #main>
+          <CodeEditor
+            :readonly="isEdit"
+            :multi-document="multiDocument"
+            ref="codeEditorRef"
+            v-model="content"
+            @error="handleEditorErr" />
+        </template>
+      </bcs-resize-layout>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { throttle } from 'lodash';
+import { computed, ref, watch } from 'vue';
+
+import AiAssistant from '@/components/ai-assistant.vue';
+import CodeEditor from '@/components/monaco-editor/new-editor.vue';
+import useFullScreen from '@/composables/use-fullscreen';
+import EditorStatus from '@/views/resource-view/resource-update/editor-status.vue';
+
+const props = defineProps({
+  isEdit: {
+    type: Boolean,
+    default: false,
+  },
+  value: {
+    type: String,
+    default: '',
+  },
+  multiDocument: {
+    type: Boolean,
+    default: true,
+  },
+  height: {
+    type: String,
+    default: '',
+  }
+});
+
+const assistantRef = ref<InstanceType<typeof AiAssistant>>();
+const codeEditorRef = ref<InstanceType<typeof CodeEditor>>();
+const content = ref('');
+
+// yaml异常
+const editorErr = ref({
+  type: '',
+  message: '',
+});
+function handleEditorErr(err: string) { // 捕获编辑器错误提示
+  editorErr.value.type = 'content'; // 编辑内容错误
+  editorErr.value.message = err;
+};
+
+
+// 获取数据
+const getData = () => content.value;
+
+// 校验数据
+const validate = async () => !editorErr.value.message;
+
+// 全屏
+const { contentRef, isFullscreen, switchFullScreen } = useFullScreen();
+// 调用AI
+const explainK8sIssue = throttle(() => {
+  assistantRef.value?.handleSendMsg(editorErr.value.message);
+  assistantRef.value?.showAITips();
+}, 300);
+
+watch(() => props.value, () => {
+  if (!props.value) return;
+  content.value = props.value;
+  codeEditorRef.value?.setValue(props.value, '');
+}, { immediate: true });
+
+watch(() => editorErr.value.message, () => {
+  if (!editorErr.value.message) return;
+
+  explainK8sIssue();
+});
+
+defineExpose({
+  getData,
+  validate,
+  content,
+});
+</script>
+<style scoped lang="postcss">
+/deep/ .dark-form {
+  .bk-label {
+    color: #B3B3B3;
+    font-size: 12px;
+  }
+  .bk-form-input {
+    background-color: #2E2E2E;
+    border: 1px solid #575757;
+    color: #B3B3B3;
+    &:focus {
+      background-color: unset !important;
+    }
+  }
+  .bk-select {
+    border: 1px solid #575757;
+    color: #B3B3B3;
+  }
+}
+
+/deep/ .file-editor .bk-resize-layout-aside {
+  border-color: #292929;
+}
+</style>
diff --git a/bcs-ui/frontend/src/composables/use-focus-on-error-field.ts b/bcs-ui/frontend/src/composables/use-focus-on-error-field.ts
new file mode 100644
index 0000000000..1958fcbb2f
--- /dev/null
+++ b/bcs-ui/frontend/src/composables/use-focus-on-error-field.ts
@@ -0,0 +1,28 @@
+import { ref } from 'vue';
+
+export function useFocusOnErrorField() {
+  const errorClasses = ref(['form-error-tip', 'error-tips', 'is-error']);
+
+  const focusOnErrorField = async () => {
+    // 自动滚动到第一个错误的位置
+    const firstErrDom = findFirstErrorElement();
+    firstErrDom?.scrollIntoView({
+      block: 'center',
+      behavior: 'smooth',
+    });
+  };
+
+  const findFirstErrorElement = () => {
+    for (const className of errorClasses.value) {
+      const elements = document.getElementsByClassName(className);
+      if (elements.length > 0) {
+        return elements[0];
+      }
+    }
+    return null;
+  };
+
+  return {
+    focusOnErrorField,
+  };
+}
\ No newline at end of file
diff --git a/bcs-ui/frontend/src/i18n/en-US.yaml b/bcs-ui/frontend/src/i18n/en-US.yaml
index b5937d58d7..68f2de96d6 100644
--- a/bcs-ui/frontend/src/i18n/en-US.yaml
+++ b/bcs-ui/frontend/src/i18n/en-US.yaml
@@ -496,6 +496,9 @@ generic:
     cidrConflict: 'CIDR conflicts with {cidr}, please re-enter.'
     fieldRequired: '{0} required'
     fieldRepeat: '{0} repeat'
+    clusterName: >-
+      The cluster name can only contain numbers, letters, mid-line lines (-), down line
+      (_), The beginning must be numbers or letters
   title:
     curVersion: Current
     diffVersion: Comparison version
@@ -818,6 +821,7 @@ cluster:
       importType: Import Type
       cloudToken: Cloud Token
       kubeConfig: Cluster KubeConfig
+      title: Import a public cloud cluster - Cluster KubeConfig
       network:
         text: Network
         intranet: Intranet
@@ -851,6 +855,7 @@ cluster:
         notSupport: >-
           If the number of controller plane nodes is less than three, high
           availability cannot be supported
+      role: Service role
     msg:
       managedClusterInfo: >-
         Create a custody cluster must add at least one node to run the necessary
@@ -899,6 +904,49 @@ cluster:
       createCloudToken: New voucher
       fileImport: File Import
       textKubeConfig: Usability testing
+    aws:
+      securityGroup:
+        text: Safety group
+        desc: >-
+          This selection will apply to the Safety group of the EKS-managed elastic
+          network interfaces created in your control plane subnet. To create a new
+          Safety group, please go to the appropriate page in the VPC console.
+        vpcLink: >-
+          'This selection will apply to the Safety group of the EKS-managed elastic
+          network interfaces created in your control plane subnet. To create a new
+          Safety group, please go to the appropriate page in the {0}.'
+        vpcMaster: VPC console
+      cidrTips:
+        tips1: 0.0.0.0/0 is not allowed
+        tips2: Invalid
+      nodePool: Add Node pools
+      editNodePool: Edit Node pools
+      cidrWhitelist: CIDR Whitelist
+      label:
+        defaultNodePool: Default Node Pool
+        skipOrNot: Skip or not
+      validate:
+        subnet: The node pool subnet cannot be empty
+      runtime:
+        extended:
+          label: EXTENDED
+          text: >-
+            This option supports Kubernetes versions for 26 months from the date of release.
+            Extended support requires an additional hourly fee, which begins after the
+            standard support period ends. After the extended support period ends,
+            your cluster will be automatically upgraded to the next version.
+        standard:
+          label: STANDARD
+          text: >-
+            This option supports Kubernetes versions for 14 months from the date of release,
+            at no additional cost. After the standard support period ends, your cluster will
+            be automatically upgraded to the next version.
+      tips:
+        subnetEmpty: The subnet is empty, please select a subnet first
+        awsDesc: Amazon VPC CNI ：AWS network plugin that enables Pod networking within the cluster.
+        awsLink: Overview of Amazon VPC CNI functionality.
+    azure:
+      chargingModel: Charging model
   detail:
     title:
       overview: Overview
@@ -1090,6 +1138,8 @@ cluster:
           The name does not exceed 255 characters, only supports Chinese,
           English, numbers, and scratch lines, separators (-) and decimal points
         nodeQuotaMaxSize: 'Maximum node quota is {maximum}'
+        nodeCountsMaxSize: The number of Node count cannot be greater than the Node quota
+        minNodes: The number of Node count must be greater than 0
       label:
         nameAndID: Node pool name (ID)
         nodeQuota: Node quota
@@ -3349,6 +3399,7 @@ tke:
       text: CLB
       internet: Internet
       intranet: Intranet
+      internetAndIntranet: Internet and Intranet
       desc: >-
         Used to connect the cluster APIServer via the BlueKing container
         management platform. Depending on the actual network situation, choose
@@ -3496,6 +3547,7 @@ tke:
       re-enter.
     supportCidrList: 'Supports only network segments between {0}.'
     formErr: The form was filled in incorrectly. Please modify it
+    leastTwoDifferentAZs: Subnets specified must be in at least two different AZs
   configRec:
     l100:
       text: Node Count 1~100
diff --git a/bcs-ui/frontend/src/i18n/zh-CN.yaml b/bcs-ui/frontend/src/i18n/zh-CN.yaml
index ae2e7b56ac..295995b94d 100644
--- a/bcs-ui/frontend/src/i18n/zh-CN.yaml
+++ b/bcs-ui/frontend/src/i18n/zh-CN.yaml
@@ -460,6 +460,7 @@ generic:
     cidrConflict: 'CIDR与 {cidr} 冲突，请重新输入'
     fieldRequired: '{0} 必填'
     fieldRepeat: '{0} 重复'
+    clusterName: 集群名称只能包含数字、字母、中划线(-)、下划线(_)，且开头必须是数字或字母
   title:
     createPublicCluster: 新建公有云集群
     diffVersion: 线上版本
@@ -726,6 +727,7 @@ cluster:
       cpuQuota: CPU配额(核)
       memQuota: 内存配额(GiB)
       importType: 导入方式
+      title: 导入集群 - kubeconfig 集群
       cloudToken: 云凭证
       kubeConfig: 集群kubeconfig
       network:
@@ -739,6 +741,7 @@ cluster:
           bcs-apiserver-proxy 以 daemonset 形式部署在 Kubernetes 集群中，利用 IPVS 通过虚拟
           IP（VIP）实现集群内组件到 APIserver 的反向代理，并自动发现控制面节点 IP 以维护 IPVS
           规则，确保部分控制面节点故障时集群正常运行。
+      role: 集群服务角色
     msg:
       managedClusterInfo: 创建托管集群必须添加至少一个节点，以运行必要的服务
       independentClusterInfo:
@@ -769,6 +772,39 @@ cluster:
       createCloudToken: 新增凭证
       fileImport: 文件导入
       textKubeConfig: 可用性测试
+    aws:
+      securityGroup:
+        text: 安全组
+        desc: 选择将应用到在您的控制平面子网中创建的 EKS 托管弹性网络接口的安全组。 要创建新的安全组，请转到 VPC 控制台  中的相应页面。
+        vpcLink: '选择将应用到在您的控制平面子网中创建的 EKS 托管弹性网络接口的安全组。 要创建新的安全组，请转到 {0}  中的相应页面。'
+        vpcMaster: VPC 控制台
+      cidrTips:
+        tips1: 不允许0.0.0.0/0
+        tips2: cidr不合法
+      nodePool: 添加节点池
+      editNodePool: 编辑节点池
+      cidrWhitelist: CIDR白名单
+      label:
+        defaultNodePool: 默认节点池
+        skipOrNot: 是否跳过
+      validate:
+        subnet: 节点池子网不能为空
+      runtime:
+        extended:
+          label: 已扩展
+          text: >-
+            此选项在发布之日起 26 个月内支持 Kubernetes 版本。扩展支持期需要额外支付每小时的费用，该费用在标准支持期结束后开始。
+            扩展支持结束后，您的集群将自动升级到下一个版本。
+        standard:
+          label: 标准
+          text: >-
+            此选项在发布之日起 14 个月内支持 Kubernetes 版本。没有额外费用。标准支持结束后，您的集群将自动升级到下一个版本。
+      tips:
+        subnetEmpty: 子网为空，请先选择子网
+        awsDesc: Amazon VPC CNI ：AWS 的网络插件，可以在集群内启用 Pod 联网。
+        awsLink: Amazon VPC CNI功能概述
+    azure:
+      chargingModel: 收费模式
   detail:
     title:
       overview: 集群总览
@@ -893,6 +929,8 @@ cluster:
       validate:
         name: 名称不超过255个字符，仅支持中文、英文、数字、下划线，分隔符(-)及小数点
         nodeQuotaMaxSize: '节点配额上限为{maximum}'
+        nodeCountsMaxSize: '节点数量不能大于节点配额'
+        minNodes: 节点数要大于0
       label:
         nameAndID: 节点池名称 (ID)
         nodeQuota: 节点配额
@@ -2750,6 +2788,7 @@ tke:
         用于蓝鲸容器管理平台连接集群APIServer，根据实际网络情况选择公网访问与内网访问，蓝鲸平台所在网络与被添加集群所在网络内网可连通优先选择内网访问，否则需要选择外网访问，选择不正确会导致添加集群失败
       internet: 公网访问
       intranet: 内网访问
+      internetAndIntranet: 公网和内网访问
     securityGroup:
       text: 安全组
       defaultSecurityGroupTips: 云梯默认安全组已对自研云网段配置好安全规则，无需用户再额外配置；业务如有特殊安全规则配置可创建自定义安全组，结合云梯默认安全组使用
@@ -2846,6 +2885,7 @@ tke:
     supportCidrList: '仅支持 {0} 之间网段'
     minIpNum2: '容器网段不能少于 {0} 个 IP, 请重新输入'
     formErr: 表单填写有误，请修改
+    leastTwoDifferentAZs: 指定的子网必须至少位于两个不同的可用区中
   configRec:
     l100:
       text: 节点数1~100
diff --git a/bcs-ui/frontend/src/router/cluster-manage.ts b/bcs-ui/frontend/src/router/cluster-manage.ts
index b7930dfc34..2c8781014d 100644
--- a/bcs-ui/frontend/src/router/cluster-manage.ts
+++ b/bcs-ui/frontend/src/router/cluster-manage.ts
@@ -12,6 +12,10 @@ const CreateTencentCloudCluster = () => import(/* webpackChunkName: 'cluster' */
 const CreateVCluster = () => import(/* webpackChunkName: 'cluster' */'@/views/cluster-manage/add/create/vcluster/vcluster.vue');
 // ee版本创建集群流程
 const CreateK8SCluster = () => import(/* webpackChunkName: 'cluster' */'@/views/cluster-manage/add/create/k8s.vue');
+// 创建aws云集群
+const CreateAWSCloudCluster = () => import(/* webpackChunkName: 'cluster' */'@/views/cluster-manage/add/create/aws-cloud/index.vue');
+// 创建aws云集群
+const CreateAzureCloudCluster = () => import(/* webpackChunkName: 'cluster' */'@/views/cluster-manage/add/create/azure-cloud/index.vue');
 
 // import模式
 const ImportCluster = () => import(/* webpackChunkName: 'cluster' */'@/views/cluster-manage/add/import/import-cluster.vue');
@@ -118,6 +122,26 @@ export default [
       hideMenu: true,
     },
   },
+  // 创建亚马逊云集群
+  {
+    path: 'clusters/cloud/aws',
+    name: 'CreateAWSCloudCluster',
+    component: CreateAWSCloudCluster,
+    meta: {
+      menuId: 'CLUSTER',
+      hideMenu: true,
+    },
+  },
+  // 创建微软云集群
+  {
+    path: 'clusters/cloud/azure',
+    name: 'CreateAzureCloudCluster',
+    component: CreateAzureCloudCluster,
+    meta: {
+      menuId: 'CLUSTER',
+      hideMenu: true,
+    },
+  },
   // 创建k8s原生集群
   {
     path: 'clusters/k8s',
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/components/login-type.vue b/bcs-ui/frontend/src/views/cluster-manage/add/components/login-type.vue
index 4f5234fa76..51f01f57d0 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/add/components/login-type.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/components/login-type.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div class="bk-button-group">
+    <div class="bk-button-group" v-if="showHead">
       <bk-button
         :class="[{ 'is-selected': loginType === 'password' }]"
         @click="loginType = 'password'">
@@ -46,7 +46,7 @@
             <bcs-option
               v-for="item in keyPairs"
               :key="item.KeyID"
-              :id="item.KeyID"
+              :id="item[valueKey]"
               :name="`${item.KeyName}(${item.KeyID})`">
             </bcs-option>
             <template #extension>
@@ -106,6 +106,14 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  showHead: {
+    type: Boolean,
+    default: true,
+  },
+  valueKey: {
+    type: String,
+    default: 'KeyID',
+  },
 });
 
 const emits = defineEmits([
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/components/network-selector.vue b/bcs-ui/frontend/src/views/cluster-manage/add/components/network-selector.vue
new file mode 100644
index 0000000000..3302223f05
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/components/network-selector.vue
@@ -0,0 +1,108 @@
+<template>
+  <bk-radio-group
+    v-model="clusterConnectSetting.ITNType"
+    @change="handleChange"
+  >
+    <div
+      v-for="item in valueList"
+      :key="item.value"
+      class="flex items-center mb-[8px] h-[32px]">
+      <bk-radio :value="item.value">
+        {{ item.label }}
+      </bk-radio>
+    </div>
+    <!-- 公网cidr -->
+    <combination-input
+      v-if="clusterConnectSetting?.isExtranet"
+      :list="clusterConnectSetting.cidrs"
+      @data-change="updateSecurityGroup"
+      :ref="el => combinationInputRef = el"
+      key-required
+      :key-rules="keyRules" />
+  </bk-radio-group>
+</template>
+<script setup lang="ts">
+import { PropType, ref, watch } from 'vue';
+
+import combinationInput from '@/components/combination-input.vue';
+import $i18n from '@/i18n/i18n-setup';
+
+const props = defineProps({
+  value: {
+    type: Object,
+    default: [],
+  },
+  region: {
+    type: String,
+    default: '',
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  cloudID: {
+    type: String,
+    default: '',
+  },
+  valueList: {
+    required: true,
+    type: Array as PropType<{
+      label: string;
+      value: string | number;
+    }[]>,
+    default: () => [],
+  },
+});
+const emits = defineEmits(['change']);
+
+const clusterConnectSetting = ref({
+  ITNType: 'intranet',
+  isExtranet: false,
+  internet: {
+    publicIPAssigned: false,
+    publicAccessCidrs: [], // 真正传给后端的ip数组
+  },
+  cidrs: [], // ip对象数组
+});
+
+// ip校验规则
+const keyRules = [
+  {
+    message: $i18n.t('cluster.create.aws.cidrTips.tips1'),
+    validator: '^(?!0.0.0.0/0$).*$',
+  },
+  {
+    message: $i18n.t('cluster.create.aws.cidrTips.tips2'),
+    validator: '^((25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9]).){3}(25[0-5]|2[0-4][0-9]|1[0-9]{2}|[1-9]?[0-9])/([0-9]|[12][0-9]|3[0-2])$',
+  },
+];
+
+const combinationInputRef = ref<any>(null);
+// 将ip对象数组转为ip字符串数组
+function updateSecurityGroup(value) {
+  clusterConnectSetting.value.cidrs = value;
+  clusterConnectSetting.value.internet.publicAccessCidrs = value.map(item => item.key);
+}
+
+function handleChange(value) {
+  clusterConnectSetting.value.isExtranet = !!['internetAndIntranet', 'internet'].includes(value);
+}
+
+// 检验ip合法性
+async function validate() {
+  return await combinationInputRef.value?.validateAll();
+};
+
+// 回显
+watch(() => props.value, () => {
+  if (JSON.stringify(props.value) === JSON.stringify(clusterConnectSetting.value)) return;
+
+  clusterConnectSetting.value = JSON.parse(JSON.stringify(props.value));
+}, { immediate: true });
+
+watch(clusterConnectSetting, () => {
+  emits('change', clusterConnectSetting.value);
+}, { deep: true });
+
+defineExpose({ validate });
+</script>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/components/zone.vue b/bcs-ui/frontend/src/views/cluster-manage/add/components/zone.vue
index 7fc5fbca33..357418be51 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/add/components/zone.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/components/zone.vue
@@ -7,7 +7,7 @@
     <bcs-option
       v-for="zone in zoneList"
       :key="zone.zoneID"
-      :id="zone.zone"
+      :id="zone[valueId]"
       :name="zone.zoneName"
       :disabled="disabledList.includes(zone.zone)"
       v-bk-tooltips="{
@@ -67,6 +67,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  valueId: {
+    type: String,
+    default: 'zone',
+  },
 });
 
 const emits = defineEmits(['input', 'change']);
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/add-node-pools.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/add-node-pools.vue
new file mode 100644
index 0000000000..a654328dbf
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/add-node-pools.vue
@@ -0,0 +1,636 @@
+<template>
+  <div>
+    <bk-form :model="nodeConfig" :rules="nodeConfigRules" ref="formRef">
+      <bk-form-item :label="$t('cluster.create.aws.label.skipOrNot')">
+        <bk-radio-group v-model="skip" @change="handlerChange">
+          <bk-radio :value="false">{{ $t('units.boolean.false') }}</bk-radio>
+          <bk-radio :value="true">{{ $t('units.boolean.true') }}</bk-radio>
+        </bk-radio-group>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.aws.label.defaultNodePool')"
+        v-if="!skip"
+        required
+        error-display-type="normal"
+        property="nodePoolGroups"
+      >
+        <!-- <bcs-button
+          theme="primary"
+          outline
+          icon="plus"
+          @click="handleAddNode">
+          {{$t('cluster.create.aws.nodePool')}}
+        </bcs-button>
+        <bcs-button
+          theme="primary"
+          outline
+          icon="delete"
+          @click="handleDeleteNode">
+          {{$t('generic.button.delete')}}
+        </bcs-button> -->
+        <bcs-table
+          class="mt15 w-[800px]"
+          height="200px"
+          :ref="el => tableRef = el"
+          v-bkloading="{ isLoading: loading }"
+          :row-class-name="getNodePoolRowClassName"
+          :data="nodePoolTableData"
+          @selection-change="handleSelectionChange">
+          <!-- <bcs-table-column type="selection" width="60" :selectable="handleSelectable">
+            <template #default="{ row }">
+              <bcs-checkbox
+                v-bk-tooltips="{
+                  content: $t('cluster.create.aws.tips.subnetEmpty'),
+                  disabled: handleSelectable(row)
+                }"
+                :checked="!!selectionList.find(item => item === row)"
+                :disabled="!handleSelectable(row)"
+                @change="handleRowSelectionChange(row)">
+              </bcs-checkbox>
+            </template>
+          </bcs-table-column> -->
+          <bcs-table-column
+            :label="$t('cluster.ca.nodePool.label.name')"
+            prop="name">
+          </bcs-table-column>
+          <bcs-table-column
+            :label="$t('cluster.ca.nodePool.label.nodeQuota')"
+            prop="autoScaling.maxSize"
+            width="100">
+          </bcs-table-column>
+          <bcs-table-column
+            :label="$t('cluster.ca.nodePool.label.nodeCounts')"
+            prop="autoScaling.desiredSize"
+            width="100">
+          </bcs-table-column>
+          <bcs-table-column
+            :label="$t('generic.ipSelector.label.serverModel')"
+            prop="nodeOS">
+          </bcs-table-column>
+          <bcs-table-column
+            :label="$t('generic.label.action')"
+            prop="action"
+            width="100">
+            <template #default="{ $index, row }">
+              <bcs-button text @click="handleEdit(row, $index)">{{ $t('generic.button.edit') }}</bcs-button>
+              <!-- <bcs-button text class="ml-[10px]" @click="handleDelete($index)">
+                {{ $t('generic.button.delete') }}
+              </bcs-button> -->
+            </template>
+          </bcs-table-column>
+        </bcs-table>
+      </bk-form-item>
+      <!-- 用户名和密码 -->
+      <bk-form-item
+        :label="$t('tke.label.loginType.ssh')"
+        property="nodeSettings.workerLogin"
+        required
+        v-if="!skip"
+        error-display-type="normal"
+        ref="loginTypeRef">
+        <LoginType
+          :show-head="false"
+          :region="region"
+          :cloud-account-i-d="cloudAccountID"
+          :cloud-i-d="cloudID"
+          :value="nodeConfig.nodeSettings.workerLogin"
+          :value-key="'KeyName'"
+          type="ssh"
+          @pass-blur="validateLogin('custom')"
+          @confirm-pass-blur="validateLogin('')"
+          @key-secret-blur="validateLogin('')"
+          @change="handleLoginValueChange" />
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.aws.securityGroup.text')"
+        :desc="{
+          allowHTML: true,
+          content: '#secPlugin1',
+        }"
+        v-if="!skip"
+        error-display-type="normal"
+        required
+        property="networkSettings.securityGroupIDs">
+        <SecurityGroups
+          class="max-w-[600px]"
+          multiple
+          :region="region"
+          :cloud-account-i-d="cloudAccountID"
+          :cloud-i-d="cloudID"
+          v-model="nodeConfig.nodeSettings.securityGroupIDs" />
+        <div id="secPlugin1">
+          <div>
+            <i18n path="cluster.create.aws.securityGroup.vpcLink">
+              <span
+                class="text-[12px] text-[#699DF4] cursor-pointer"
+                @click="openLink('https://us-west-1.console.aws.amazon.com/vpcconsole/home?region=us-west-1#SecurityGroups')">
+                {{ $t('cluster.create.aws.securityGroup.vpcMaster') }}
+              </span>
+            </i18n>
+          </div>
+        </div>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('tke.label.nodeModule.text')"
+        :desc="$t('tke.label.nodeModule.desc')"
+        property="clusterBasicSettings.module.workerModuleID"
+        error-display-type="normal"
+        required>
+        <TopoSelector
+          :placeholder="$t('generic.placeholder.select')"
+          v-model="nodeConfig.clusterBasicSettings.module.workerModuleID"
+          class="max-w-[600px]" />
+      </bk-form-item>
+      <div class="flex items-center h-[48px] bg-[#FAFBFD] px-[24px] fixed bottom-0 left-0 w-full bcs-border-top">
+        <bk-button class="min-w-[88px]" @click="preStep">{{ $t('generic.button.pre') }}</bk-button>
+        <bk-button
+          theme="primary"
+          class="ml10 min-w-[88px]"
+          @click="handleConfirm">{{ $t('generic.button.confirm') }}</bk-button>
+        <bk-button class="ml10" @click="handleCancel">{{ $t('generic.button.cancel') }}</bk-button>
+      </div>
+    </bk-form>
+    <bcs-sideslider
+      :is-show.sync="showNodeConfig"
+      :quick-close="false"
+      :title="model === 'add' ? $t('cluster.create.aws.nodePool') : $t('cluster.create.aws.editNodePool')"
+      :width="740">
+      <template #content>
+        <keep-alive>
+          <component
+            :is="stepComMap[curStep]"
+            :save-loading="saveLoading"
+            :region="region"
+            :cloud-account-i-d="cloudAccountID"
+            :cloud-i-d="cloudID"
+            :default-values="nodeDefaultValues"
+            :vpc-i-d="vpcID"
+            :bk-cloud-i-d="bkCloudID"
+            v-if="!isLoading"
+            @next="handleNextStep"
+            @pre="handlePreStep"
+            @add="handleAddnode"
+            @close="closeSlider"
+          />
+        </keep-alive>
+      </template>
+    </bcs-sideslider>
+  </div>
+</template>
+<script setup lang="ts">
+import { cloneDeep } from 'lodash';
+import { computed, onMounted, PropType, ref, watch } from 'vue';
+
+import { ISecurityGroup } from '../../../types/types';
+import LoginType from '../../components/login-type.vue';
+
+import NodePoolConfig from './node-pool-config.vue';
+import NodePoolInfo from './node-pool-info.vue';
+
+import { cloudSecurityGroups, recommendNodeGroupConf } from '@/api/modules/cluster-manager';
+import { mergeDeep } from '@/common/util';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
+import $i18n from '@/i18n/i18n-setup';
+import $store from '@/store/index';
+import SecurityGroups from '@/views/cluster-manage/add/components/security-groups.vue';
+import TopoSelector from '@/views/cluster-manage/autoscaler/components/topo-select-tree.vue';
+
+const props = defineProps({
+  region: {
+    type: String,
+    default: '',
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  cloudID: {
+    type: String,
+    default: '',
+  },
+  environment: {
+    type: String,
+    default: '',
+  },
+  provider: {
+    type: String,
+    default: '',
+  },
+  vpcID: {
+    type: String,
+    default: '',
+  },
+  master: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+  },
+  masterLogin: {
+    type: Object,
+    default: () => ({
+      initLoginUsername: '',
+      initLoginPassword: '',
+      keyPair: {
+        keyID: '',
+        keySecret: '',
+        keyPublic: '',
+      },
+    }),
+  },
+  manageType: {
+    type: String as PropType<'MANAGED_CLUSTER'|'INDEPENDENT_CLUSTER'>,
+    default: 'MANAGED_CLUSTER',
+  },
+  bkCloudID: {
+    type: Number,
+    default: 9,
+  },
+});
+
+const emits = defineEmits(['next', 'cancel', 'pre', 'confirm', 'instances-change']);
+// node配置
+const nodeConfig = ref<any>({
+  nodeGroups: [],
+  clusterBasicSettings: {
+    module: {
+      workerModuleID: '',
+    },
+  },
+  nodeSettings: {
+    workerLogin: {
+      keyPair: {
+        keyID: '',
+        keySecret: '',
+      },
+    },
+    securityGroupIDs: [],
+  },
+});
+
+// 动态 i18n 问题，这里使用computed
+const nodeConfigRules = computed(() => ({
+  'networkSettings.securityGroupIDs': [
+    {
+      trigger: 'custom',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        return nodeConfig.value.nodeSettings.securityGroupIDs.length > 0;
+      },
+    },
+  ],
+  'nodeSettings.workerLogin': [
+    {
+      trigger: 'custom',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        return nodeConfig.value.nodeSettings.workerLogin?.keyPair?.keyID
+          && nodeConfig.value.nodeSettings.workerLogin?.keyPair?.keySecret;
+      },
+    },
+  ],
+  nodePoolGroups: [
+    {
+      trigger: 'custom',
+      message: $i18n.t('cluster.create.aws.validate.subnet'),
+      validator() {
+        const list = nodePoolTableData.value;
+        if (list.length > 0) {
+          return list.every(item => item?.autoScaling?.subnetIDs && item?.autoScaling?.subnetIDs.length > 0);
+        }
+        return true;
+      },
+    },
+  ],
+  'clusterBasicSettings.module.workerModuleID': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'custom',
+    },
+  ],
+}));
+
+// 跳转链接
+const openLink = (link: string) => {
+  if (!link) return;
+
+  window.open(link);
+};
+
+const curIndex = ref();
+const model = ref<'add' | 'edit'>('add');
+const nodePoolTableData = ref<any[]>([]);
+const selectionList = ref<any[]>([]);
+// 点击添加节点
+function handleAddNode() {
+  nodeDefaultValues.value = cloneDeep(defaultValues.value);
+  model.value = 'add';
+  showNodeConfig.value = true;
+};
+// 删除节点按钮
+function handleDeleteNode() {
+  if (selectionList.value.length === 0) return;
+  nodePoolTableData.value = nodePoolTableData.value.reduce((pre, curItem) => {
+    if (selectionList.value.findIndex(item => item.$id === curItem.$id) < 0) {
+      pre.push(curItem);
+    }
+    return pre;
+  }, []);
+};
+// 添加/编辑节点操作
+function handleAddnode() {
+  if (model.value === 'add') {
+    nodePoolTableData.value = [...nodePoolTableData.value, nodePoolData.value];
+  } else {
+    nodePoolTableData.value.splice(curIndex.value, 1, nodePoolData.value);
+  }
+  nodePoolData.value = {};
+}
+// 删除节点操作
+function handleDelete(index) {
+  nodePoolTableData.value = nodePoolTableData.value.filter((_, i) => i !== index);
+}
+// 编辑节点
+function handleEdit(row, index) {
+  curIndex.value = index;
+  nodeDefaultValues.value = cloneDeep(mergeDeep(nodeDefaultValues.value, row));
+  model.value = 'edit';
+  showNodeConfig.value = true;
+}
+// 选择节点
+function handleSelectionChange(selection) {
+  selectionList.value = selection;
+}
+
+
+// 选择单个节点
+const tableRef = ref();
+function handleRowSelectionChange(row) {
+  const index = selectionList.value.findIndex(item => item.$id === row.$id);
+  if (index > -1) {
+    selectionList.value.splice(index, 1);
+    // 更新表格原本选中状态
+    tableRef.value?.toggleRowSelection(row, false);
+  } else {
+    selectionList.value.push(row);
+    tableRef.value?.toggleRowSelection(row, true);
+  }
+};
+// 关闭侧滑框
+function closeSlider() {
+  showNodeConfig.value = false;
+  curStep.value = 1;
+  nodeDefaultValues.value = cloneDeep(defaultValues.value);
+}
+
+const curStep = ref(1);
+const stepComMap = {
+  1: NodePoolConfig,
+  2: NodePoolInfo,
+};
+const nodePoolData = ref<Record<string, any>>({});
+const handleNextStep = (data) => {
+  nodePoolData.value = mergeDeep(nodePoolData.value, data);
+  if (curStep.value + 1 <= 2) {
+    curStep.value = curStep.value + 1;
+  }
+};
+const handlePreStep = () => {
+  curStep.value = curStep.value - 1;
+};
+
+const isLoading = ref(false);
+const saveLoading = ref(false);
+
+// 登录方式
+const validateLogin = (trigger = '') => {
+  formRef.value?.$refs?.loginTypeRef?.validate(trigger);
+};
+const handleLoginValueChange = (value) => {
+  nodeConfig.value.nodeSettings.workerLogin = value;
+};
+
+// 安全组
+const securityGroupLoading = ref(false);
+const securityGroups = ref<Array<ISecurityGroup>>([]);
+const handleGetSecurityGroups = async () => {
+  if (!props.region || !props.cloudAccountID) return;
+  securityGroupLoading.value = true;
+  securityGroups.value = await cloudSecurityGroups({
+    $cloudId: props.cloudID,
+    accountID: props.cloudAccountID,
+    region: props.region,
+  }).catch(() => []);
+  securityGroupLoading.value = false;
+};
+
+// 节点池默认配置
+const defaultValues = ref({
+  autoScaling: {
+    maxSize: 10,
+    minSize: 0,
+    multiZoneSubnetPolicy: 'PRIORITY',
+    retryPolicy: 'IMMEDIATE_RETRY',
+    scalingMode: 'CLASSIC_SCALING',
+  },
+  clusterID: '',
+  creator: '',
+  enableAutoscale: true,
+  launchTemplate: {
+    CPU: 4,
+    Mem: 8,
+    dataDisks: [],
+    imageInfo: {
+      imageID: 'img-eb30mz89',
+    },
+    internetAccess: {
+      internetChargeType: 'TRAFFIC_POSTPAID_BY_HOUR',
+      internetMaxBandwidth: '0',
+      publicIPAssigned: false,
+    },
+    systemDisk: {
+      diskSize: '50',
+      diskType: 'CLOUD_PREMIUM',
+    },
+    keyPair: {
+      keyID: '',
+      keySecret: '',
+    },
+  },
+  name: '',
+  nodeTemplate: {
+    dockerGraphPath: '/data/bcs/service/docker',
+    taints: [],
+    unSchedulable: 0,
+  },
+  region: '',
+});
+const nodeDefaultValues = ref();
+const loading = ref(false);
+// 获取节点池默认数据
+async function getNodeGroupData() {
+  loading.value = true;
+  const result = await recommendNodeGroupConf({
+    $cloudId: props.cloudID,
+    region: props.region,
+    accountID: props.cloudAccountID,
+  }).catch(() => []);
+  nodePoolTableData.value = result.map((item, index) => setNodeInfo(item, index));
+  loading.value = false;
+}
+// 磁盘类型
+const diskEnum = ref([
+  {
+    id: 'gp2',
+    name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.gp2'),
+  },
+  {
+    id: 'gp3',
+    name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.gp3'),
+  },
+  {
+    id: 'io1',
+    name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.io1'),
+  },
+  {
+    id: 'io2',
+    name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.io2'),
+  },
+  {
+    id: 'st1',
+    name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.st1'),
+  },
+  {
+    id: 'sc1',
+    name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.sc1'),
+  },
+]);
+const user = computed(() => $store.state.user);
+function setNodeInfo(data, index) {
+  return {
+    $id: `${index}id_${Date.now()}`,
+    status: 'CREATING',
+    creator: user.value.username,
+    name: data?.name || '', // 节点名称
+    nodeOS: data?.instanceProfile?.nodeOS || '', // 节点操作系统
+    autoScaling: {
+      serviceRole: data?.serviceRoleName || '', // iam角色
+      subnetIDs: data?.networkProfile?.subnetIDs || [], // 支持子网
+      maxSize: data?.scalingProfile?.maxSize,
+      scalingMode: data?.scalingProfile?.scalingMode || 'Delete', // 扩缩容模式, 释放模式改为Delete
+      desiredSize: data?.scalingProfile?.desiredSize || 0,
+    },
+    launchTemplate: {
+      CPU: data?.hardwareProfile?.CPU || '',
+      GPU: data?.hardwareProfile?.GPU || '',
+      Mem: data?.hardwareProfile?.Mem || '',
+      instanceType: data?.instanceProfile?.instanceType, // 机型信息
+      InstanceChargeType: data?.instanceProfile?.instanceChargeType, // 实例计费方式
+      systemDisk: {
+        diskType: diskEnum.value.some(item => item.id === data?.hardwareProfile?.systemDisk?.diskType)
+          ? data?.hardwareProfile?.systemDisk?.diskType
+          : 'gp3', // 系统盘类型
+        diskSize: data?.hardwareProfile?.systemDisk?.diskSize, // 系统盘大小
+      },
+      internetAccess: {
+        publicIPAssigned: data?.networkProfile?.publicIPAssigned, // 分配免费公网IP
+      },
+      // 密钥信息
+      keyPair: {
+        keyID: '',
+        keySecret: '',
+      },
+      initLoginUsername: '', // 用户名
+      securityGroupIDs: [], // 安全组
+      dataDisks: data?.hardwareProfile?.dataDisks || [], // 数据盘
+      // 默认值
+      isSecurityService: true,
+      isMonitorService: true,
+    },
+    nodeTemplate: {
+      dataDisks: data?.hardwareProfile?.dataDisks || [],
+    },
+  };
+}
+
+// 添加、编辑节点池
+const showNodeConfig = ref(false);
+
+// 设置行背景颜色
+function getNodePoolRowClassName({ row }) {
+  return row?.autoScaling?.subnetIDs && row?.autoScaling?.subnetIDs.length > 0 ? '' : '!bg-red-50';
+};
+// 设置是否可选
+function handleSelectable(row) {
+  return row?.autoScaling?.subnetIDs && row?.autoScaling?.subnetIDs.length > 0;
+};
+
+// 是否跳过
+const skip = ref(false);
+function handlerChange(value) {
+  skip.value = value;
+};
+
+watch([
+  () => props.region,
+  () => props.cloudAccountID,
+], () => {
+  handleGetSecurityGroups();
+  getNodeGroupData();
+});
+
+watch(() => nodeConfig.value.nodeSettings.workerLogin, () => {
+  defaultValues.value.launchTemplate.keyPair = nodeConfig.value.nodeSettings?.workerLogin?.keyPair;
+  nodePoolTableData.value.forEach((node) => {
+    !node?.launchTemplate && (node.launchTemplate = {});
+    !node?.launchTemplate?.keyPair && (node.launchTemplate.keyPair = {});
+    node.launchTemplate.keyPair.keyID = nodeConfig.value.nodeSettings?.workerLogin?.keyPair?.keyID;
+    node.launchTemplate.keyPair.keySecret = nodeConfig.value.nodeSettings?.workerLogin?.keyPair?.keySecret;
+  });
+}, { deep: true });
+
+// 校验表单
+const formRef = ref();
+const validate = async () => {
+  const result = await formRef.value?.validate().catch(() => false);
+  return result;
+};
+
+// 上一步
+const preStep = () => {
+  emits('pre');
+};
+// 下一步
+const { focusOnErrorField } = useFocusOnErrorField();
+const handleConfirm = async () => {
+  const result = await validate();
+  if (result) {
+    nodeConfig.value.nodeGroups = skip.value ? [] : nodePoolTableData.value;
+    nodeConfig.value.nodeGroups.forEach((item) => {
+      item.autoScaling.vpcID = props.vpcID;
+      item.bkCloudID = props.bkCloudID;
+      item.launchTemplate.securityGroupIDs = [...nodeConfig.value.nodeSettings.securityGroupIDs];
+    });
+    emits('next', {
+      ...nodeConfig.value,
+    });
+    emits('confirm');
+  } else {
+    // 自动滚动到第一个错误的位置
+    focusOnErrorField();
+  }
+};
+// 取消
+const handleCancel = () => {
+  emits('cancel');
+};
+
+onMounted(async () => {
+  isLoading.value = true;
+  nodeDefaultValues.value = cloneDeep(defaultValues.value);
+  isLoading.value = false;
+});
+
+defineExpose({
+  validate,
+});
+</script>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/basic-pool-info.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/basic-pool-info.vue
new file mode 100644
index 0000000000..79f536b7c7
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/basic-pool-info.vue
@@ -0,0 +1,285 @@
+<!-- eslint-disable max-len -->
+<template>
+  <bk-form class="node-pool-info" :model="nodePoolInfo" :rules="nodePoolInfoRules" ref="formRef">
+    <bk-form-item
+      :label="$t('cluster.ca.nodePool.label.nodeQuota')"
+      property="maxSize"
+      required
+      error-display-type="normal">
+      <bk-input
+        class="w74"
+        int
+        v-model="nodePoolInfo.autoScaling.maxSize"
+        :min="0"
+        type="number">
+      </bk-input>
+    </bk-form-item>
+    <bk-form-item
+      :label="$t('cluster.ca.nodePool.label.nodeCounts')"
+      property="desiredSize"
+      required
+      error-display-type="normal">
+      <bk-input
+        class="w74"
+        int
+        v-model="nodePoolInfo.autoScaling.desiredSize"
+        :min="0"
+        type="number">
+      </bk-input>
+    </bk-form-item>
+    <bk-form-item
+      :label="$t('cluster.ca.nodePool.create.enableAutoscale.title')"
+      :desc="$t('cluster.ca.nodePool.create.enableAutoscale.tips')">
+      <bk-checkbox v-model="nodePoolInfo.enableAutoscale" :disabled="isEdit"></bk-checkbox>
+    </bk-form-item>
+    <bk-form-item :label="$t('k8s.label')" property="labels" error-display-type="normal">
+      <KeyValue
+        class="max-w-[420px]"
+        :min-item="0"
+        :disable-delete-item="false"
+        v-model="nodePoolInfo.nodeTemplate.labels">
+      </KeyValue>
+    </bk-form-item>
+    <bk-form-item :label="$t('k8s.taint')" property="taints" error-display-type="normal">
+      <span
+        class="add-key-value-items" v-if="!nodePoolInfo.nodeTemplate.taints.length"
+        @click="handleAddTaints">
+        <i class="bk-icon icon-plus-circle-shape mr5"></i>
+        {{$t('generic.button.add')}}
+      </span>
+      <Taints
+        class="taints"
+        :effect-options="effectEnum"
+        :key-rules="[]"
+        v-model="nodePoolInfo.nodeTemplate.taints"
+        v-else>
+      </Taints>
+    </bk-form-item>
+    <bk-form-item :label="$t('k8s.annotation')" property="annotations" error-display-type="normal">
+      <KeyValue
+        class="max-w-[420px]"
+        :min-item="0"
+        :disable-delete-item="false"
+        v-model="nodePoolInfo.nodeTemplate.annotations">
+      </KeyValue>
+    </bk-form-item>
+    <bk-form-item
+      :label="$t('cluster.ca.nodePool.create.scalingMode.title')"
+      :desc="$t('cluster.ca.nodePool.create.scalingMode.desc')">
+      <bk-radio-group v-model="nodePoolInfo.autoScaling.scalingMode">
+        <span class="inline-block">
+          <bk-radio disabled value="Delete">{{$t('cluster.ca.nodePool.create.scalingMode.classic_scaling')}}</bk-radio>
+        </span>
+      </bk-radio-group>
+    </bk-form-item>
+  </bk-form>
+</template>
+<script lang="ts">
+import { sortBy } from 'lodash';
+import { defineComponent, onMounted, ref, toRefs } from 'vue';
+
+import { nodemanCloudList } from '@/api/base';
+import $i18n from '@/i18n/i18n-setup';
+import KeyValue from '@/views/cluster-manage/components/key-value.vue';
+import Taints from '@/views/cluster-manage/components/new-taints.vue';
+
+export default defineComponent({
+  name: 'AwsBasciPoolInfo',
+  components: { KeyValue, Taints },
+  props: {
+    // 详情数据或者默认值
+    defaultValues: {
+      type: Object,
+      default: () => ({}),
+    },
+    isEdit: {
+      type: Boolean,
+      default: false,
+    },
+    cluster: {
+      type: Object,
+      default: () => ({}),
+    },
+  },
+  setup(props) {
+    const { defaultValues, isEdit } = toRefs(props);
+    const formRef = ref<any>(null);
+    const nodePoolInfo = ref({
+      autoScaling: {
+        maxSize: defaultValues.value.autoScaling?.maxSize, // 节点数量范围
+        minSize: defaultValues.value.autoScaling?.minSize,
+        scalingMode: 'Delete', // 扩缩容模式, 释放模式改为Delete
+        desiredSize: defaultValues.value.autoScaling?.desiredSize || 0,
+      },
+      enableAutoscale: defaultValues.value.enableAutoscale, // 是否开启弹性伸缩
+      nodeTemplate: {
+        unSchedulable: 1, // 是否开启调度 0 代表开启调度，1 不可调度
+        labels: defaultValues.value.nodeTemplate?.labels || {}, // 标签
+        taints: defaultValues.value.nodeTemplate?.taints || [], // 污点
+        annotations: defaultValues.value.nodeTemplate?.annotations || {}, // 注解
+      },
+      bkCloudID: isEdit.value ? defaultValues.value.area?.bkCloudID : 0,
+      bkCloudName: defaultValues.value.area?.bkCloudName || '',
+    });
+
+    const effectEnum = ref([
+      'NoSchedule',
+      'PreferNoSchedule',
+      'NoExecute',
+    ]);
+
+    const nodePoolInfoRules = ref({
+      // 节点配额校验, 超过配额上限后提示，数字输入框有输入和点击按钮加减来更改值，所以用blur和change触发
+      maxSize: [
+        {
+          message: $i18n.t('cluster.ca.nodePool.validate.nodeQuotaMaxSize', {
+            maximum: 2000,
+          }),
+          trigger: 'change',
+          validator: () => 2000 >= nodePoolInfo.value.autoScaling.maxSize,
+        },
+      ],
+      desiredSize: [
+        {
+          message: $i18n.t('cluster.ca.nodePool.validate.nodeCountsMaxSize'),
+          trigger: 'change',
+          validator: () => nodePoolInfo.value.autoScaling.desiredSize <= nodePoolInfo.value.autoScaling.maxSize,
+        },
+        {
+          message: $i18n.t('cluster.ca.nodePool.validate.minNodes'),
+          trigger: 'change',
+          validator: () => nodePoolInfo.value.autoScaling.desiredSize > 0,
+        },
+      ],
+      labels: [
+        {
+          message: $i18n.t('generic.validate.labelValueEmpty'),
+          trigger: 'custom',
+          // eslint-disable-next-line max-len
+          validator: () => Object.keys(nodePoolInfo.value.nodeTemplate.labels).every(key => !!nodePoolInfo.value.nodeTemplate.labels[key]),
+        },
+        {
+          message: $i18n.t('generic.validate.labelKey'),
+          trigger: 'custom',
+          validator: () => {
+            const keys = Object.keys(nodePoolInfo.value.nodeTemplate.labels);
+            const values = keys.map(key => nodePoolInfo.value.nodeTemplate.labels[key]);
+            return keys.every(v => /^[A-Za-z0-9._/-]+$/.test(v)) && values.every(v => /^[A-Za-z0-9._/-]+$/.test(v));
+          },
+        },
+      ],
+      taints: [
+        {
+          message: $i18n.t('generic.validate.required1'),
+          trigger: 'custom',
+          validator: () => nodePoolInfo.value.nodeTemplate.taints.every(item => item.key && item.value && item.effect),
+        },
+        {
+          message: $i18n.t('generic.validate.repeatKey'),
+          trigger: 'custom',
+          validator: () => {
+            const data = nodePoolInfo.value.nodeTemplate.taints.reduce((pre, item) => {
+              if (item.key) {
+                pre.push(item.key);
+              }
+              return pre;
+            }, []);
+            const removeDuplicateData = new Set(data);
+            return data.length === removeDuplicateData.size;
+          },
+        },
+        {
+          message: $i18n.t('generic.validate.labelKey'),
+          trigger: 'custom',
+          validator: () => (nodePoolInfo.value.nodeTemplate.taints as any[])
+            .every(item => /^[A-Za-z0-9._/-]+$/.test(item.key) && /^[A-Za-z0-9._/-]+$/.test(item.value)),
+        },
+      ],
+      annotations: [
+        {
+          message: $i18n.t('generic.validate.annotationValueEmpty'),
+          trigger: 'custom',
+          validator: () => Object.keys(nodePoolInfo.value.nodeTemplate.annotations)
+            .every(key => !!nodePoolInfo.value.nodeTemplate.annotations[key]),
+        },
+        {
+          message: $i18n.t('generic.validate.labelKey'),
+          trigger: 'custom',
+          validator: () => {
+            const keys = Object.keys(nodePoolInfo.value.nodeTemplate.annotations);
+            const values = keys.map(key => nodePoolInfo.value.nodeTemplate.annotations[key]);
+            return keys.every(v => /^[A-Za-z0-9._/-]+$/.test(v)) && values.every(v => /^[A-Za-z0-9._/-]+$/.test(v));
+          },
+        },
+      ],
+    });
+
+    const validate = async () => {
+      const result = await formRef.value?.validate();
+      return result;
+    };
+    const handleAddTaints = () => {
+      nodePoolInfo.value.nodeTemplate.taints.push({
+        key: '',
+        value: '',
+        effect: 'PreferNoSchedule',
+      });
+    };
+
+    // 云区域列表
+    const cloudList = ref<any[]>([]);
+    const cloudLoading = ref(false);
+    const handleGetCloudList = async () => {
+      cloudLoading.value = true;
+      const data = await nodemanCloudList().catch(() => []);
+      cloudList.value = sortBy(data, 'bk_cloud_name').sort((item) => {
+        if (item.bk_cloud_id === 0) return -1;
+        return 0;
+      });
+      cloudLoading.value = false;
+    };
+    const handleCloudIDChange = (id: string) => {
+      const data = cloudList.value.find(item => item.bk_cloud_id === id);
+      if (data) {
+        nodePoolInfo.value.bkCloudName = data.bk_cloud_name;
+      }
+    };
+
+    onMounted(() => {
+      handleGetCloudList();
+    });
+
+    return {
+      formRef,
+      nodePoolInfo,
+      nodePoolInfoRules,
+      effectEnum,
+      handleAddTaints,
+      validate,
+      cloudLoading,
+      cloudList,
+      handleCloudIDChange,
+    };
+  },
+});
+</script>
+<style lang="postcss" scoped>
+.node-pool-info {
+    >>> .w74 {
+        width: 74px;
+    }
+    >>> .w160 {
+        width: 160px;
+    }
+    >>> .bk-form-content {
+        max-width: 600px;
+    }
+    >>> .add-key-value-items {
+        font-size: 14px;
+        color: #3a84ff;
+        cursor: pointer;
+        display: flex;
+        align-items: center;
+    }
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/basic.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/basic.vue
new file mode 100644
index 0000000000..8d0ecb4906
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/basic.vue
@@ -0,0 +1,416 @@
+<template>
+  <bk-form
+    :model="basicInfo"
+    :rules="basicInfoRules"
+    ref="formRef"
+    class="k8s-form grid grid-cols-2 grid-rows-1 gap-[16px]">
+    <DescList size="middle" :title="$t('cluster.create.label.clusterInfo')">
+      <bk-form-item :label="$t('cluster.create.label.kubernetesProvider')">
+        {{ $t('provider.yamaxunyun') }}
+      </bk-form-item>
+      <bk-form-item :label="$t('tke.label.account')" property="cloudAccountID" error-display-type="normal" required>
+        <bk-select :loading="accountLoading" v-model="basicInfo.cloudAccountID" searchable :clearable="false">
+          <bk-option
+            v-for="item in accountList"
+            :key="item.account.accountID"
+            :id="item.account.accountID"
+            :name="item.account.accountName">
+          </bk-option>
+          <template slot="extension">
+            <SelectExtension
+              :link-text="$t('tke.link.cloudToken')"
+              @link="gotoTencentToken"
+              @refresh="handleGetAccounts" />
+          </template>
+        </bk-select>
+      </bk-form-item>
+      <bk-form-item :label="$t('cluster.create.label.role')" property="role" error-display-type="normal" required>
+        <bk-select :loading="roleLoading" v-model="basicInfo.clusterIamRole" searchable :clearable="false">
+          <bk-option
+            v-for="item in roleList"
+            :key="item.roleName"
+            :id="item.roleName"
+            :name="item.roleName">
+          </bk-option>
+        </bk-select>
+      </bk-form-item>
+      <bk-form-item :label="$t('cluster.labels.name')" property="clusterName" error-display-type="normal" required>
+        <bk-input
+          :maxlength="64"
+          :placeholder="$t('cluster.create.validate.name')"
+          v-model.trim="basicInfo.clusterName">
+        </bk-input>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.label.clusterVersion')"
+        property="clusterBasicSettings.version"
+        error-display-type="normal"
+        required>
+        <bk-select
+          :loading="templateLoading"
+          v-model="basicInfo.clusterBasicSettings.version"
+          searchable
+          :clearable="false"
+          class="max-w-[calc(50%-46px)]">
+          <bk-option v-for="item in versionList" :key="item" :id="item" :name="item"></bk-option>
+        </bk-select>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('k8s.label')"
+        property="labels"
+        error-display-type="normal">
+        <KeyValue
+          v-model="basicInfo.clusterBasicSettings.clusterTags"
+          :key-rules="[
+            {
+              message: $t('generic.validate.label'),
+              validator: LABEL_KEY_REGEXP,
+            }
+          ]"
+          :value-rules="[
+            {
+              message: $t('generic.validate.label'),
+              validator: LABEL_KEY_REGEXP,
+            }
+          ]" />
+      </bk-form-item>
+      <bk-form-item :label="$t('cluster.create.label.desc')">
+        <bk-input maxlength="100" v-model="basicInfo.description" type="textarea"></bk-input>
+      </bk-form-item>
+    </DescList>
+    <div>
+      <DescList size="middle" :title="$t('cluster.labels.env')">
+        <bk-form-item :label="$t('cluster.create.label.region')" property="region" error-display-type="normal" required>
+          <Region
+            :cloud-account-i-d="basicInfo.cloudAccountID"
+            :cloud-i-d="cloudID"
+            init-data
+            v-model="basicInfo.region" />
+        </bk-form-item>
+        <bk-form-item
+          :label="$t('tke.label.nodemanArea')"
+          property="clusterBasicSettings.area.bkCloudID"
+          error-display-type="normal"
+          required>
+          <bk-select
+            searchable
+            :clearable="false"
+            :loading="nodemanCloudLoading"
+            v-model="basicInfo.clusterBasicSettings.area.bkCloudID">
+            <bk-option
+              v-for="item in nodemanCloudList"
+              :key="item.bk_cloud_id"
+              :id="item.bk_cloud_id"
+              :name="item.bk_cloud_name">
+            </bk-option>
+            <template slot="extension">
+              <SelectExtension
+                :link-text="$t('tke.link.nodeman')"
+                :link="`${PROJECT_CONFIG.nodemanHost}/#/cloud-manager`"
+                @refresh="handleGetNodeManCloud" />
+            </template>
+          </bk-select>
+        </bk-form-item>
+        <bk-form-item :label="$t('cluster.labels.env')" property="environment" error-display-type="normal" required>
+          <bk-radio-group v-model="basicInfo.environment">
+            <bk-radio value="debug">
+              {{ $t('cluster.env.debug') }}
+            </bk-radio>
+            <bk-radio value="prod">
+              {{ $t('cluster.env.prod') }}
+            </bk-radio>
+          </bk-radio-group>
+        </bk-form-item>
+      </DescList>
+      <DescList class="mt-[24px]" size="middle" :title="$t('cluster.title.clusterConfig')">
+        <bk-form-item
+          :desc="{
+            content: upgradeStrategyData.flagDesc,
+          }"
+          :label="$t('k8s.updateStrategy.text')">
+          <div class="flex">
+            <div
+              @click="handleUpgrade('EXTENDED')"
+              :class="[
+                'flex-1 rounded-md border p-[8px] pt-[2px] cursor-pointer',
+                upgradeStrategyData.defaultValue === 'EXTENDED' ? 'bg-[#E1F0FF] border-[#3A84FF]' : '',
+              ]">
+              <div class="flex items-center">
+                <bk-radio :checked="upgradeStrategyData.defaultValue === 'EXTENDED'"></bk-radio>
+                <span class="font-bold ml-[6px]">{{ labelEnum['EXTENDED'] }}</span>
+              </div>
+              <div class="text-[12px] leading-normal ml-[24px]">{{ upgradEnum['EXTENDED'] }}</div>
+            </div>
+            <div
+              @click="handleUpgrade('STANDARD')"
+              :class="[
+                'flex-1 ml-[10px] rounded-md border p-[8px] pt-[2px] cursor-pointer',
+                upgradeStrategyData.defaultValue === 'STANDARD' ? 'bg-[#E1F0FF] border-[#3A84FF]' : '',
+              ]">
+              <div class="flex items-center">
+                <bk-radio :checked="upgradeStrategyData.defaultValue === 'STANDARD'"></bk-radio>
+                <span class="font-bold ml-[6px]">{{ labelEnum['STANDARD'] }}</span>
+              </div>
+              <div class="text-[12px] leading-normal ml-[24px]">{{ upgradEnum['STANDARD'] }}</div>
+            </div>
+          </div>
+        </bk-form-item>
+      </DescList>
+    </div>
+    <div class="flex items-center h-[48px] bg-[#FAFBFD] px-[24px] fixed bottom-0 left-0 w-full bcs-border-top">
+      <bk-button theme="primary" class="ml10" @click="nextStep">{{ $t('generic.button.next') }}</bk-button>
+      <bk-button class="ml10" @click="handleCancel">{{ $t('generic.button.cancel') }}</bk-button>
+    </div>
+  </bk-form>
+</template>
+<script setup lang="ts">
+import { computed, onMounted, PropType, ref, watch } from 'vue';
+
+import { INodeManCloud } from '../../../types/types';
+
+import {
+  cloudDetail,
+  cloudVersionModules,
+  nodemanCloud,
+} from '@/api/modules/cluster-manager';
+import { CLUSTER_NAME_REGEX, LABEL_KEY_REGEXP } from '@/common/constant';
+import DescList from '@/components/desc-list.vue';
+import SelectExtension from '@/components/select-extension.vue';
+import $i18n from '@/i18n/i18n-setup';
+import $router from '@/router';
+import Region from '@/views/cluster-manage/add/components/region.vue';
+import KeyValue from '@/views/cluster-manage/components/key-value.vue';
+import useCloud, { ICloudAccount, ICloudRole } from '@/views/cluster-manage/use-cloud';
+
+const props = defineProps({
+  cloudID: {
+    type: String as PropType<CloudID>,
+    default: '',
+  },
+});
+
+const emits = defineEmits(['next', 'cancel']);
+
+// 基本信息
+const basicInfo = ref({
+  cloudAccountID: '', // 云凭证
+  clusterName: '',
+  environment: '',
+  provider: '',
+  clusterIamRole: '', // 集群服务角色
+  clusterBasicSettings: {
+    version: '',
+    area: {  // 云区域
+      bkCloudID: 0,
+    },
+    clusterTags: {},
+    upgradePolicy: {
+      supportType: 'EXTENDED',
+    },
+  },
+  description: '',
+  region: '',
+  labels: {},
+  clusterAdvanceSettings: {
+    containerRuntime: '', // 运行时
+    runtimeVersion: '', // 运行时版本
+  },
+});
+watch(() => basicInfo.value.cloudAccountID, () => {
+  basicInfo.value.region = '';
+  handleGetRoles();
+});
+const basicInfoRules = ref({
+  cloudAccountID: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  clusterName: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+    {
+      message: $i18n.t('generic.validate.clusterName'),
+      validator: () => {
+        const { clusterName } = basicInfo.value;
+        const rule = new RegExp(CLUSTER_NAME_REGEX);
+        return rule.test(clusterName);
+      },
+      trigger: 'blur',
+    },
+  ],
+  'clusterBasicSettings.version': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  region: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'clusterBasicSettings.area.bkCloudID': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  environment: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  labels: [
+    {
+      message: $i18n.t('generic.validate.label'),
+      trigger: 'custom',
+      validator: () => {
+        const { labels } = basicInfo.value;
+        const rule = new RegExp(LABEL_KEY_REGEXP);
+        return Object.keys(labels).every(key => rule.test(key) && rule.test(labels[key]));
+      },
+    },
+  ],
+});
+
+// 集群模板
+const templateDetail = ref<Partial<ICloudTemplateDetail>>({});
+const templateLoading = ref(false);
+const handleGetTemplateList = async () => {
+  templateLoading.value = true;
+  templateDetail.value = await cloudDetail({
+    $cloudId: props.cloudID,
+  }).catch(() => []);
+  basicInfo.value.provider = templateDetail.value?.cloudID || '';
+  // 初始化默认集群版本
+  basicInfo.value.clusterBasicSettings.version = templateDetail.value?.clusterManagement?.availableVersion?.[0] || '';
+  templateLoading.value = false;
+};
+
+// 云凭证
+const { cloudAccounts, getCloudRolesList } = useCloud();
+const accountLoading = ref(false);
+const accountList = ref<ICloudAccount[]>([]);
+const handleGetAccounts = async () => {
+  accountLoading.value = true;
+  const { data } = await cloudAccounts(props.cloudID);
+  accountList.value = data;
+  // 初始化第一个云凭证
+  basicInfo.value.cloudAccountID = accountList.value?.[0]?.account?.accountID || '';
+  accountLoading.value = false;
+};
+const gotoTencentToken = () => {
+  const { href } = $router.resolve({ name: 'amazonCloud' });
+  window.open(href);
+};
+
+// 集群服务角色
+const roleLoading = ref(false);
+const roleList = ref<ICloudRole[]>([]);
+async function handleGetRoles() {
+  roleLoading.value = true;
+  const { data } = await getCloudRolesList(props.cloudID, basicInfo.value.cloudAccountID, 'cluster');
+  roleList.value = data;
+  // 初始化第一个角色
+  basicInfo.value.clusterIamRole = roleList.value?.[0]?.roleName || '';
+  roleLoading.value = false;
+};
+
+
+// 版本列表
+const versionList = computed(() => templateDetail.value?.clusterManagement?.availableVersion || []);
+
+
+// 管控区域
+const nodemanCloudList = ref<Array<INodeManCloud>>([]);
+const nodemanCloudLoading = ref(false);
+const handleGetNodeManCloud = async () => {
+  nodemanCloudLoading.value = true;
+  nodemanCloudList.value = await nodemanCloud().catch(() => []);
+  nodemanCloudLoading.value = false;
+};
+
+const moduleLoading = ref(false);
+// 升级策略
+async function getRuntimeModuleParams() {
+  if (!basicInfo.value.clusterBasicSettings.version) return {};
+  moduleLoading.value = true;
+  const data = await cloudVersionModules({
+    $cloudId: props.cloudID,
+    $version: basicInfo.value.clusterBasicSettings.version,
+    $module: 'runtime',
+  }).catch(() => []);
+  moduleLoading.value = false;
+  return data.length > 0 ? data[0] : {};
+};
+
+// 升级策略数据
+const upgradeStrategyData = ref<any>({
+  defaultValue: '',
+});
+const labelEnum = {
+  EXTENDED: $i18n.t('cluster.create.aws.runtime.extended.label'),
+  STANDARD: $i18n.t('cluster.create.aws.runtime.standard.label'),
+};
+const upgradEnum = {
+  EXTENDED: $i18n.t('cluster.create.aws.runtime.extended.text'),
+  STANDARD: $i18n.t('cluster.create.aws.runtime.standard.text'),
+};
+watch(() => basicInfo.value.clusterBasicSettings.version, async () => {
+  const result = await getRuntimeModuleParams();
+  upgradeStrategyData.value = result;
+  basicInfo.value.clusterBasicSettings.upgradePolicy.supportType = upgradeStrategyData.value.defaultValue || '';
+}, { immediate: true });
+function handleUpgrade(type) {
+  basicInfo.value.clusterBasicSettings.upgradePolicy.supportType = type;
+  upgradeStrategyData.value = {
+    ...upgradeStrategyData.value,
+    defaultValue: type,
+  };
+}
+
+onMounted(async () => {
+  handleGetTemplateList();
+  await handleGetAccounts();
+  handleGetNodeManCloud();
+  handleGetRoles();
+});
+
+// 校验
+const formRef = ref();
+const validate = async () => {
+  const result = await formRef.value?.validate().catch(() => false);
+  return result;
+};
+
+// 下一步
+const nextStep = async () => {
+  const result = await validate();
+  result && emits('next', basicInfo.value);
+};
+// 取消
+const handleCancel = () => {
+  emits('cancel');
+};
+
+defineExpose({
+  validate,
+});
+</script>
+<style scoped lang="postcss">
+/deep/ .bk-option-group-name {
+  border-bottom: 0 !important;
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/index.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/index.vue
new file mode 100644
index 0000000000..ebf97c8690
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/index.vue
@@ -0,0 +1,291 @@
+<!-- eslint-disable max-len -->
+<template>
+  <BcsContent
+    :padding="0"
+    class="add-aws-cluster"
+    :title="$t('cluster.button.addCluster')"
+    :desc="$t('generic.title.createPublicCluster')">
+    <div class="h-full pt-[8px] bg-[#f0f1f5]">
+      <bcs-tab
+        :label-height="42"
+        :validate-active="false"
+        :active.sync="activeTabName"
+        type="card-tab"
+        class="h-full">
+        <!-- 基本信息 -->
+        <bcs-tab-panel :name="steps[0].name">
+          <template #label>
+            <StepTabLabel
+              :title="$t('generic.title.basicInfo1')"
+              :step-num="1"
+              :active="activeTabName === steps[0].name"
+              :is-error="steps[0].isErr" />
+          </template>
+          <BasicInfo
+            :cloud-i-d="cloudID"
+            ref="basicRef"
+            @next="nextStep"
+            @cancel="handleCancel" />
+        </bcs-tab-panel>
+        <!-- 网络配置 -->
+        <bcs-tab-panel :name="steps[1].name" :disabled="steps[1].disabled">
+          <template #label>
+            <StepTabLabel
+              :title="$t('cluster.detail.title.network')"
+              :step-num="2"
+              :active="activeTabName === steps[1].name"
+              :disabled="steps[1].disabled"
+              :is-error="steps[1].isErr" />
+          </template>
+          <Network
+            :region="clusterData.region"
+            :cloud-account-i-d="clusterData.cloudAccountID"
+            :cloud-i-d="cloudID"
+            ref="netRef"
+            @pre="preStep"
+            @next="nextStep"
+            @cancel="handleCancel" />
+        </bcs-tab-panel>
+        <!-- Master配置 -->
+        <bcs-tab-panel :name="steps[2].name" :disabled="steps[2].disabled">
+          <template #label>
+            <StepTabLabel
+              :title="$t('cluster.detail.title.controlConfig')"
+              :step-num="3"
+              :active="activeTabName === steps[2].name"
+              :disabled="steps[2].disabled"
+              :is-error="steps[2].isErr" />
+          </template>
+          <Master
+            :region="clusterData.region"
+            :cloud-account-i-d="clusterData.cloudAccountID"
+            :cloud-i-d="cloudID"
+            :provider="clusterData.provider"
+            :vpc-i-d="clusterData.vpcID"
+            :nodes="clusterData.nodes"
+            ref="masterRef"
+            @pre="preStep"
+            @next="nextStep"
+            @cancel="handleCancel"
+            @instances-change="handleMasterInstanceChange" />
+        </bcs-tab-panel>
+        <!-- 添加节点池 -->
+        <bcs-tab-panel :name="steps[3].name" :disabled="steps[3].disabled">
+          <template #label>
+            <StepTabLabel
+              :title="$t('cluster.create.aws.nodePool')"
+              :step-num="4"
+              :active="activeTabName === steps[3].name"
+              :disabled="steps[3].disabled"
+              :is-error="steps[3].isErr" />
+          </template>
+          <AddNodePools
+            :region="clusterData.region"
+            :cloud-account-i-d="clusterData.cloudAccountID"
+            :cloud-i-d="cloudID"
+            :environment="clusterData.environment"
+            :provider="clusterData.provider"
+            :vpc-i-d="clusterData.vpcID"
+            :master="clusterData.master"
+            :master-login="clusterData.nodeSettings ? clusterData.nodeSettings.masterLogin : undefined"
+            :manage-type="clusterData.manageType"
+            :auto-generate-master-nodes="clusterData.autoGenerateMasterNodes"
+            :bk-cloud-i-d="clusterData?.clusterBasicSettings?.area?.bkCloudID"
+            ref="nodesRef"
+            @pre="preStep"
+            @next="nextStep"
+            @cancel="handleCancel"
+            @confirm="handleShowConfirmDialog"
+            @instances-change="handleNodesInstanceChange" />
+        </bcs-tab-panel>
+      </bcs-tab>
+    </div>
+  </BcsContent>
+</template>
+<script lang="ts" setup>
+import { merge, mergeWith } from 'lodash';
+import { computed, provide, ref, watch } from 'vue';
+
+import { ClusterDataInjectKey, DeepPartial, IClusterData, IInstanceItem  } from '../../../types/types';
+
+import AddNodePools from './add-node-pools.vue';
+import BasicInfo from './basic.vue';
+import Master from './master.vue';
+import Network from './network.vue';
+
+import { createCluster } from '@/api/modules/cluster-manager';
+import $bkMessage from '@/common/bkmagic';
+import $bkInfo from '@/components/bk-magic-2.0/bk-info';
+import BcsContent from '@/components/layout/Content.vue';
+import { useProject } from '@/composables/use-app';
+import $i18n from '@/i18n/i18n-setup';
+import $router from '@/router';
+import $store from '@/store';
+import StepTabLabel from '@/views/cluster-manage/add/components/step-tab-label.vue';
+
+const cloudID: CloudID = 'awsCloud';
+
+const steps = ref([
+  { name: 'basicInfo', disabled: false, isErr: false },
+  { name: 'network',  disabled: true, isErr: false },
+  { name: 'master',  disabled: true, isErr: false },
+  { name: 'nodes', disabled: true, isErr: false },
+]);
+
+const activeTabName = ref<typeof steps.value[number]['name']>('basicInfo');
+
+const clusterData = ref<DeepPartial<IClusterData>>({});
+
+provide(ClusterDataInjectKey, clusterData);
+
+// tab切换
+watch(activeTabName, () => {
+  const tabItem = steps.value.find(item => item.name === activeTabName.value);
+  if (tabItem) {
+    tabItem.isErr = false;
+  }
+});
+
+// 机型
+const masterInstances = ref<IInstanceItem[]>([]);
+const handleMasterInstanceChange = (data) => {
+  masterInstances.value = data;
+};
+const nodeInstances = ref<IInstanceItem[]>([]);
+const handleNodesInstanceChange = (data) => {
+  nodeInstances.value = data;
+};
+// 上一步
+const preStep = async () => {
+  const index = steps.value.findIndex(step => activeTabName.value === step.name);
+  if (index > -1 && index - 1 >= 0) {
+    activeTabName.value = steps.value[index - 1]?.name;
+  }
+};
+// 下一步
+const nextStep = async (data = {}) => {
+  clusterData.value = mergeWith({}, clusterData.value, data, (objValue, srcValue) => {
+    if (Array.isArray(objValue)) {
+      return srcValue;
+    }
+  });
+  const index = steps.value.findIndex(step => activeTabName.value === step.name);
+  if (index > -1 && index + 1 < steps.value.length) {
+    steps.value[index + 1].disabled = false;
+    activeTabName.value = steps.value[index + 1]?.name;
+  }
+};
+const handleCancel = () => {
+  $router.back();
+};
+// 校验表单
+const basicRef = ref();
+const netRef = ref();
+const masterRef = ref();
+const nodesRef = ref();
+const validate = async () => {
+  const list = [
+    basicRef.value.validate().then((result) => {
+      steps.value[0].isErr = !result;
+      return result;
+    }),
+    netRef.value.validate().then((result) => {
+      steps.value[1].isErr = !result;
+      return result;
+    }),
+    masterRef.value.validate().then((result) => {
+      steps.value[2].isErr = !result;
+      return result;
+    }),
+    nodesRef.value.validate().then((result) => {
+      steps.value[3].isErr = !result;
+      return result;
+    }),
+  ];
+  const data = await Promise.all(list);
+  return data.every(result => !!result);
+};
+// 创建集群
+const handleShowConfirmDialog = async () => {
+  const result = await validate();
+  if (!result) return;
+
+  $bkInfo({
+    type: 'warning',
+    clsName: 'custom-info-confirm',
+    title: $i18n.t('cluster.create.button.confirmCreateCluster.text'),
+    defaultInfo: true,
+    confirmFn: async () => {
+      await handleCreateCluster();
+    },
+  });
+};
+const { curProject } = useProject();
+const user = computed(() => $store.state.user);
+const handleCreateCluster = async () => {
+  const params = merge(
+    {
+      projectID: curProject.value.projectID,
+      businessID: String(curProject.value.businessID),
+      engineType: 'k8s',
+      isExclusive: true,
+      clusterType: 'single',
+      creator: user.value.username,
+    },
+    {
+      instances: [
+        ...masterInstances.value,
+        ...nodeInstances.value,
+      ],
+    },
+    clusterData.value,
+  );
+  const result = await createCluster(params).catch(() => false);
+  if (result) {
+    $bkMessage({
+      theme: 'success',
+      message: $i18n.t('generic.msg.success.deliveryTask'),
+    });
+    $router.push({
+      name: 'clusterMain',
+      params: {
+        highlightClusterId: result?.clusterID,
+      },
+    });
+  }
+};
+
+</script>
+<style lang="postcss" scoped>
+>>> .bk-tab-header {
+  padding: 0 8px;
+}
+>>> .bk-tab-section {
+  overflow: auto;
+  height: calc(100% - 80px);
+}
+
+>>> .k8s-form .bk-form-content {
+  max-width: 600px;
+  padding-right: 24px;
+}
+>>> .prefix {
+  display: inline-block;
+  height: 32px;
+  line-height: 32px;
+  background: #F0F1F5;
+  border: 1px solid #C4C6CC;
+  border-radius: 2px 0 0 2px;
+  padding: 0 8px;
+  font-size: 12px;
+  &.disabled {
+    border-color: #dcdee5;
+  }
+}
+
+.add-aws-cluster {
+  >>> .bk-form-item+.bk-form-item {
+    margin-top: 24px;
+  }
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/master.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/master.vue
new file mode 100644
index 0000000000..e04d41be79
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/master.vue
@@ -0,0 +1,155 @@
+<template>
+  <bk-form :model="masterConfig" :rules="masterConfigRules" ref="formRef">
+    <bk-form-item :label="$t('cluster.create.label.manageType.text')">
+      <div class="bk-button-group">
+        <bk-button
+          :class="['min-w-[136px]', { 'is-selected': masterConfig.manageType === 'MANAGED_CLUSTER' }]"
+          @click="handleChangeManageType('MANAGED_CLUSTER')">
+          <div class="flex items-center">
+            <span class="flex text-[16px] text-[#f85356]">
+              <i class="bcs-icon bcs-icon-hot"></i>
+            </span>
+            <span class="ml-[8px]">{{ $t('bcs.cluster.managed') }}</span>
+          </div>
+        </bk-button>
+      </div>
+      <div class="text-[12px] leading-[20px] mt-[4px]">
+        <span>{{ $t('amazonCloud.label.aksDesc') }}</span>
+      </div>
+    </bk-form-item>
+    <bk-form-item
+      :label="$t('tke.label.apiServerCLB.text')"
+      :desc="$t('tke.label.apiServerCLB.desc')"
+      property="clusterAdvanceSettings.clusterConnectSetting.cidrs"
+      error-display-type="normal"
+      key="cidrs"
+      required>
+      <NetworkSelector
+        :ref="el => networkSelectorRef = el"
+        class="max-w-[600px]"
+        :value="masterConfig.clusterAdvanceSettings.clusterConnectSetting"
+        :region="region"
+        :cloud-account-i-d="cloudAccountID"
+        :cloud-i-d="cloudID"
+        :value-list="[
+          { label: $t('tke.label.apiServerCLB.internet'), value: 'internet' },
+          { label: $t('tke.label.apiServerCLB.intranet'), value: 'intranet' },
+        ]"
+        @change="(v) => masterConfig.clusterAdvanceSettings.clusterConnectSetting = v" />
+    </bk-form-item>
+    <div class="flex items-center h-[48px] bg-[#FAFBFD] px-[24px] fixed bottom-0 left-0 w-full bcs-border-top">
+      <bk-button @click="preStep">{{ $t('generic.button.pre') }}</bk-button>
+      <bk-button theme="primary" class="ml10" @click="nextStep">{{ $t('generic.button.next') }}</bk-button>
+      <bk-button class="ml10" @click="handleCancel">{{ $t('generic.button.cancel') }}</bk-button>
+    </div>
+  </bk-form>
+</template>
+<script setup lang="ts">
+import { computed, PropType, ref } from 'vue';
+
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
+import $i18n from '@/i18n/i18n-setup';
+import NetworkSelector from '@/views/cluster-manage/add/components/network-selector.vue';
+
+const props = defineProps({
+  region: {
+    type: String,
+    default: '',
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  cloudID: {
+    type: String,
+    default: '',
+  },
+  provider: {
+    type: String,
+    default: '',
+  },
+  vpcID: {
+    type: String,
+    default: '',
+  },
+  nodes: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+  },
+});
+
+const emits = defineEmits(['next', 'cancel', 'pre']);
+
+// master配置
+const masterConfig = ref({
+  manageType: 'MANAGED_CLUSTER',
+  autoGenerateMasterNodes: true,
+  clusterAdvanceSettings: {
+    clusterConnectSetting: {
+      ITNType: 'intranet',
+      isExtranet: false,
+      subnetId: '',
+      cidrs: [],
+      internet: {
+        publicIPAssigned: false,
+        publicAccessCidrs: [],
+      },
+    },
+  },
+});
+
+const networkSelectorRef = ref<InstanceType<typeof NetworkSelector> | null>(null);
+// 动态 i18n 问题，这里使用computed
+const masterConfigRules = computed(() => ({
+  'clusterAdvanceSettings.clusterConnectSetting.cidrs': [
+    {
+      trigger: 'blur',
+      message: $i18n.t('generic.validate.required'),
+      async validator() {
+        if (masterConfig.value.clusterAdvanceSettings.clusterConnectSetting.ITNType === 'internet') {
+          return await networkSelectorRef.value?.validate();
+        }
+        return true;
+      },
+    },
+  ],
+}));
+
+// master配置
+const handleChangeManageType = (type: 'INDEPENDENT_CLUSTER' | 'MANAGED_CLUSTER') => {
+  masterConfig.value.manageType = type;
+};
+
+// 校验master节点
+const formRef = ref();
+const validate = async () => {
+  const result = await formRef.value?.validate().catch(() => false);
+  return result;
+};
+
+// 上一步
+const preStep = () => {
+  emits('pre');
+};
+// 下一步
+const { focusOnErrorField } = useFocusOnErrorField();
+const nextStep = async () => {
+  const result = await validate();
+  if (result) {
+    emits('next', {
+      ...masterConfig.value,
+    });
+  } else {
+    // 自动滚动到第一个错误的位置
+    focusOnErrorField();
+  }
+};
+// 取消
+const handleCancel = () => {
+  emits('cancel');
+};
+
+defineExpose({
+  validate,
+});
+</script>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/network.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/network.vue
new file mode 100644
index 0000000000..c834379843
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/network.vue
@@ -0,0 +1,447 @@
+<template>
+  <bk-form
+    class="k8s-form"
+    :label-width="160"
+    :model="networkConfig"
+    :rules="networkConfigRules"
+    ref="formRef">
+    <DescList size="middle" :title="$t('cluster.create.label.basicConfig')">
+      <bk-form-item :label="$t('cluster.create.label.region')" required>
+        <Region :value="region" :cloud-account-i-d="cloudAccountID" :cloud-i-d="cloudID" disabled />
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.label.privateNet.text')"
+        property="vpcID"
+        error-display-type="normal"
+        required
+        class="private-net-form-item">
+        <div class="flex items-center">
+          <Vpc
+            class="max-w-[576px] flex-1"
+            :cloud-account-i-d="cloudAccountID"
+            :cloud-i-d="cloudID"
+            :region="region"
+            init-data
+            v-model="networkConfig.vpcID"
+            @change="handleGetVpcDetail" />
+          <span
+            :class="[
+              'inline-flex items-center',
+              'px-[16px] h-[24px] rounded-full bg-[#F0F1F5] text-[12px] ml-[8px]'
+            ]"
+            v-if="networkConfig.clusterAdvanceSettings.networkType === 'VPC-CNI'">
+            {{ $t('tke.tips.totalIpNum', [vpcDetail.allocateIpNum || '--']) }}
+          </span>
+        </div>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.label.defaultNetPlugin')"
+        :desc="{
+          allowHTML: true,
+          content: '#netPlugin',
+        }"
+        property="clusterAdvanceSettings.networkType"
+        error-display-type="normal"
+        required>
+        <bcs-select :clearable="false" searchable v-model="networkConfig.clusterAdvanceSettings.networkType">
+          <bcs-option id="VPC-CNI" name="VPC-CNI"></bcs-option>
+        </bcs-select>
+        <div id="netPlugin">
+          <div>{{ $t('cluster.create.aws.tips.awsDesc') }}</div>
+          <div>
+            <i18n path="tke.button.goDetail">
+              <span
+                class="text-[12px] text-[#699DF4] cursor-pointer"
+                @click="openLink('https://docs.aws.amazon.com/zh_cn/eks/latest/userguide/managing-vpc-cni.html')">
+                {{ $t('cluster.create.aws.tips.awsLink') }}
+              </span>
+            </i18n>
+          </div>
+        </div>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.label.clusterIPType.text')"
+        property="networkSettings.clusterIpType"
+        error-display-type="normal"
+        required
+        class="unset-form-content-width">
+        <bk-radio-group v-model="networkConfig.networkSettings.clusterIpType">
+          <bk-radio value="ipv4">
+            <span>IPv4</span>
+          </bk-radio>
+          <bk-radio value="ipv6" disabled>
+            <span v-bk-tooltips="$t('tke.tips.notSupport')">IPv6</span>
+          </bk-radio>
+        </bk-radio-group>
+      </bk-form-item>
+    </DescList>
+    <DescList class="mt-[24px]" size="middle" :title="$t('cluster.create.label.netSetting')">
+      <!-- VPC-CNI模式 -->
+      <bk-form-item
+        label="Service"
+        :desc="$t('tke.tips.ipCannotBeAdjustedWhenCreated', ['Service'])"
+        property="serviceIP"
+        error-display-type="normal"
+        required
+        key="VPC-CNI-Service">
+        <div class="flex items-center">
+          <template v-if="['ipv4', 'dual'].includes(networkConfig.networkSettings.clusterIpType)">
+            <div class="flex-1 flex max-w-[50%]">
+              <bk-input
+                class="mr-[24px] flex-1"
+                :placeholder="$t('tke.placeholder.example', ['172.16.0.0/20'])"
+                v-model.trim="networkConfig.networkSettings.serviceIPv4CIDR">
+                <div
+                  slot="prepend"
+                  class="text-[12px] px-[12px] leading-[28px] whitespace-nowrap">
+                  CIDR
+                </div>
+              </bk-input>
+            </div>
+            <span
+              class="inline-flex items-center px-[16px] h-[24px] rounded-full bg-[#F0F1F5] text-[12px] ml-[-8px]">
+              {{ $t('tke.tips.totalIpNum', [countIPsInCIDR(networkConfig.networkSettings.serviceIPv4CIDR) || 0]) }}
+            </span>
+          </template>
+        </div>
+      </bk-form-item>
+      <bk-form-item
+        label="Pod IP"
+        :desc="$t('tke.tips.vpcCniPodIp')"
+        property="podIP"
+        error-display-type="normal"
+        required
+        key="VPC-CNI-Pod-IP">
+        <template v-if="['ipv4', 'dual'].includes(networkConfig.networkSettings.clusterIpType)">
+          <VpcCni
+            :subnets="networkConfig.networkSettings.subnetSource.new"
+            :cloud-account-i-d="cloudAccountID"
+            :cloud-i-d="cloudID"
+            :region="region"
+            value-id="zoneName"
+            @change="handleSetSubnetSourceNew" />
+        </template>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.aws.securityGroup.text')"
+        :desc="{
+          allowHTML: true,
+          content: '#secPlugin',
+        }"
+        error-display-type="normal"
+        property="clusterAdvanceSettings.clusterConnectSetting.securityGroup"
+        required>
+        <SecurityGroups
+          class="max-w-[600px]"
+          :region="region"
+          :cloud-account-i-d="cloudAccountID"
+          :cloud-i-d="cloudID"
+          v-model="networkConfig.clusterAdvanceSettings.clusterConnectSetting.securityGroup" />
+        <div id="secPlugin">
+          <div>
+            <i18n path="cluster.create.aws.securityGroup.vpcLink">
+              <span
+                class="text-[12px] text-[#699DF4] cursor-pointer"
+                @click="openLink('https://us-west-1.console.aws.amazon.com/vpcconsole/home?region=us-west-1#SecurityGroups')">
+                {{ $t('cluster.create.aws.securityGroup.vpcMaster') }}
+              </span>
+            </i18n>
+          </div>
+        </div>
+      </bk-form-item>
+    </DescList>
+    <div class="flex items-center h-[48px] bg-[#FAFBFD] px-[24px] fixed bottom-0 left-0 w-full bcs-border-top">
+      <bk-button @click="preStep">{{ $t('generic.button.pre') }}</bk-button>
+      <bk-button
+        :loading="validating"
+        theme="primary"
+        class="ml10"
+        @click="nextStep">{{ $t('generic.button.next') }}</bk-button>
+      <bk-button class="ml10" @click="handleCancel">{{ $t('generic.button.cancel') }}</bk-button>
+    </div>
+  </bk-form>
+</template>
+<script setup lang="ts">
+import { ref, watch } from 'vue';
+
+import { IVpcItem } from '../../../types/types';
+
+import VpcCni from './vpc-cni.vue';
+
+import { cloudCidrconflict, cloudVPC } from '@/api/modules/cluster-manager';
+import { cidrContains, countIPsInCIDR, validateCIDR } from '@/common/util';
+import DescList from '@/components/desc-list.vue';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
+import $i18n from '@/i18n/i18n-setup';
+import Region from '@/views/cluster-manage/add/components/region.vue';
+import SecurityGroups from '@/views/cluster-manage/add/components/security-groups.vue';
+import Vpc from '@/views/cluster-manage/add/components/vpc.vue';
+
+const props = defineProps({
+  region: {
+    type: String,
+    default: '',
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  cloudID: {
+    type: String,
+    default: '',
+  },
+});
+
+const emits = defineEmits(['next', 'cancel', 'pre']);
+
+// 网络配置
+const networkConfig = ref({
+  vpcID: '',
+  networkType: '', // overlay underlay
+  networkSettings: {
+    serviceIPv4CIDR: '',
+    maxNodePodNum: 64, // 单节点pod数量上限
+    maxServiceNum: 128,
+    clusterIpType: 'ipv4', // ipv4
+    isStaticIpMode: false,
+    subnetSource: {
+      new: [],
+    },
+    securityGroupIDs: [], // 安全组
+  },
+  clusterAdvanceSettings: {
+    networkType: 'VPC-CNI',   // 网络插件
+    clusterConnectSetting: {
+      securityGroup: '',
+    },
+  },
+});
+
+watch(() => props.region, () => {
+  networkConfig.value.networkSettings.subnetSource.new = [];
+});
+watch(() => networkConfig.value.clusterAdvanceSettings.networkType, () => {
+  networkConfig.value.networkSettings.maxServiceNum = 0;
+});
+const conflictCIDR = ref('');
+const networkConfigRules = ref({
+  vpcID: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'clusterAdvanceSettings.networkType': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'networkSettings.clusterIpType': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'clusterAdvanceSettings.clusterConnectSetting.securityGroup': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  // service IP
+  serviceIP: [
+    {
+      trigger: 'blur',
+      message: $i18n.t('generic.validate.required'),
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('generic.validate.cidr'),
+      async validator() {
+        return networkConfig.value.networkSettings.serviceIPv4CIDR
+          && validateCIDR(networkConfig.value.networkSettings.serviceIPv4CIDR);
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.minIpNum2', [128]),
+      async validator() {
+        const counts = countIPsInCIDR(networkConfig.value.networkSettings.serviceIPv4CIDR) || 0;
+        return counts >= 128;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.cidrMaskLen', ['[10, 24]']),
+      async validator() {
+        const cidr = networkConfig.value.networkSettings.serviceIPv4CIDR;
+        const mask = Number(cidr?.split('/')?.[1] || 0);
+        return mask >= 10 && mask <= 24;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.supportCidrList', ['10.0.0.0/8, 172.16.0.0/16 ~ 172.31.0.0/16, 192.168.0.0/16']),
+      async validator() {
+        const cidr = networkConfig.value.networkSettings.serviceIPv4CIDR;
+        return cidrContains(cidr, '10.0.0.0/8')
+          || cidrContains(cidr, ['172.16.0.0/16', '172.31.0.0/16'])
+          || cidrContains(cidr, '192.168.0.0/16');
+      },
+    },
+    {
+      trigger: 'blur',
+      message: () => $i18n.t('generic.validate.cidrConflict', { cidr: conflictCIDR.value }),
+      async validator() {
+        return networkConfig.value.networkSettings.serviceIPv4CIDR
+          && await cidrConflict(networkConfig.value.networkSettings.serviceIPv4CIDR);
+      },
+    },
+  ],
+  // POD IP数量
+  podIP: [
+    {
+      trigger: 'blur',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        const subnetSource = networkConfig.value.networkSettings.subnetSource.new as Array<{
+          mask: number
+          zone: string
+        }>;
+        return subnetSource.length && subnetSource.every(item => item.mask && item.zone);
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.minPodIP'),
+    },
+    {
+      trigger: 'custom',
+      message: $i18n.t('tke.validate.podIPsNeedLessThanVpcIPs'),
+      validator() {
+        const subnetSource = networkConfig.value.networkSettings.subnetSource.new as Array<{
+          mask: number
+          zone: string
+        }>;
+        const counts = subnetSource.reduce((counts, item) => {
+          counts += item.mask;
+          return counts;
+        }, 0);
+
+        return counts <= (vpcDetail.value.allocateIpNum || 0);
+      },
+    },
+    {
+      trigger: 'custom',
+      message: $i18n.t('tke.validate.leastTwoDifferentAZs'),
+      validator() {
+        const subnetSource = networkConfig.value.networkSettings.subnetSource.new as Array<{
+          mask: number
+          zone: string
+        }>;
+        const zones = subnetSource.map(item => item.zone);
+
+        return zones.length > 1 && new Set(zones).size > 1;
+      },
+    },
+  ],
+});
+// VPC详情
+const vpcDetail = ref<Partial<IVpcItem>>({});
+const handleGetVpcDetail = async (vpcID: string) => {
+  validating.value = true;
+  // 取数组第 1 个
+  const [detail] = await cloudVPC({
+    $cloudId: props.cloudID,
+    region: props.region,
+    accountID: props.cloudAccountID,
+    vpcID,
+  });
+  vpcDetail.value = detail;
+  validating.value = false;
+};
+
+// 设置vpc-cni子网
+const handleSetSubnetSourceNew = (data) => {
+  networkConfig.value.networkSettings.subnetSource.new = data;
+};
+
+// CIDR 冲突检测
+const cidrConflict = async (cidr) => {
+  if (!networkConfig.value.vpcID || !props.region || !props.cloudAccountID) return true;
+  const { cidrs = [] } =  await cloudCidrconflict({
+    $cloudId: props.cloudID,
+    $vpc: networkConfig.value.vpcID,
+    region: props.region,
+    accountID: props.cloudAccountID,
+    cidr,
+  }).catch(() => false);
+  conflictCIDR.value = cidrs.join(',');
+  return !cidrs.length;
+};
+
+watch([
+  () => props.region,
+  () => props.cloudAccountID,
+], () => {
+  networkConfig.value.vpcID = '';
+}, { immediate: true });
+
+// 跳转链接
+const openLink = (link: string) => {
+  if (!link) return;
+
+  window.open(link);
+};
+
+// 校验
+const formRef = ref();
+const validate = async () => {
+  const result = await formRef.value?.validate().catch(() => false);
+  return result;
+};
+
+// 上一步
+const preStep = () => {
+  emits('pre');
+};
+// 下一步
+const { focusOnErrorField } = useFocusOnErrorField();
+const validating = ref(false);
+const nextStep = async () => {
+  validating.value = true;
+  const result = await validate();
+  validating.value = false;
+  if (result) {
+    emits('next', {
+      ...networkConfig.value,
+      networkType: 'underlay',
+    });
+  } else {
+    // 自动滚动到第一个错误的位置
+    focusOnErrorField();
+  }
+};
+// 取消
+const handleCancel = () => {
+  emits('cancel');
+};
+
+defineExpose({
+  validate,
+});
+</script>
+<style scoped lang="postcss">
+>>> .private-net-form-item .bk-form-content {
+  max-width: 800px !important;
+}
+
+>>> .unset-form-content-width .bk-form-content {
+  max-width: none !important;
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/node-pool-config.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/node-pool-config.vue
new file mode 100644
index 0000000000..c791af2556
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/node-pool-config.vue
@@ -0,0 +1,885 @@
+<!-- eslint-disable max-len -->
+<template>
+  <div>
+    <div class="p-[24px] node-config-wrapper" ref="nodeConfigRef">
+      <bk-form class="node-config" :model="nodePoolConfig" :rules="nodePoolConfigRules" ref="formRef" :label-width="100">
+        <bk-form-item class="max-w-[674px]" :label="$t('cluster.ca.nodePool.label.name')" property="name" required>
+          <bk-input v-model="nodePoolConfig.name"></bk-input>
+          <p class="text-[#979BA5] leading-4 mt-[4px]">{{ $t('cluster.ca.nodePool.validate.name') }}</p>
+        </bk-form-item>
+        <bk-form-item
+          :label="$t('cluster.ca.nodePool.label.serviceRole')"
+          property="nodePoolConfig.autoScaling.serviceRole"
+          required
+          error-display-type="normal">
+          <div class="flex items-center h-[32px]">
+            <bcs-select
+              class="flex-1"
+              v-model="nodePoolConfig.autoScaling.serviceRole"
+              searchable
+              :loading="nodeRolesLoading"
+              :disabled="isEdit"
+              :clearable="false">
+              <bcs-option
+                v-for="role in nodeRoles"
+                :key="role.roleID"
+                :id="role.roleName"
+                :name="role.roleName" />
+            </bcs-select>
+          </div>
+        </bk-form-item>
+        <bk-form-item
+          :label="$t('cluster.ca.nodePool.label.system')"
+          error-display-type="normal"
+          required>
+          <bcs-input disabled v-model="nodePoolConfig.launchTemplate.imageInfo.imageName"></bcs-input>
+        </bk-form-item>
+        <!-- 计费模式 -->
+        <bk-form-item
+          :label="$t('tke.label.chargeType.text')"
+          :desc="{
+            allowHTML: true,
+            content: '#chargeDesc',
+          }"
+          property="nodePoolConfig.launchTemplate.InstanceChargeType"
+          error-display-type="normal"
+          required>
+          <bk-radio-group
+            class="inline-flex items-center h-[32px]"
+            v-model="nodePoolConfig.launchTemplate.InstanceChargeType"
+            :disabled="isEdit">
+            <bk-radio value="ON_DEMAND" disabled>
+              {{ $t('tke.label.chargeType.postpaid_by_hour') }}
+            </bk-radio>
+          </bk-radio-group>
+          <div id="chargeDesc">
+            <div>{{ $t('tke.label.chargeType.postpaid_by_hour_desc', [$t('tke.label.chargeType.postpaid_by_hour')]) }}</div>
+          </div>
+        </bk-form-item>
+        <bk-form-item :label="$t('cluster.ca.nodePool.create.instanceTypeConfig.title')">
+          <div class="mb15" style="display: flex;">
+            <div class="prefix-select">
+              <span :class="['prefix', { disabled: isEdit }]">CPU</span>
+              <bcs-select
+                v-model="CPU"
+                searchable
+                :clearable="false"
+                :disabled="isEdit"
+                :placeholder="' '"
+                class="bg-[#fff]">
+                <bcs-option id="" :name="$t('generic.label.total')"></bcs-option>
+                <bcs-option
+                  v-for="cpuItem in cpuList"
+                  :key="cpuItem"
+                  :id="cpuItem"
+                  :name="cpuItem">
+                </bcs-option>
+              </bcs-select>
+              <span :class="['company', { disabled: isEdit }]">{{$t('units.suffix.cores')}}</span>
+            </div>
+            <div class="prefix-select ml30">
+              <span :class="['prefix', { disabled: isEdit }]">{{$t('generic.label.mem')}}</span>
+              <bcs-select
+                v-model="Mem"
+                searchable
+                :clearable="false"
+                :disabled="isEdit"
+                :placeholder="' '"
+                class="bg-[#fff]">
+                <bcs-option id="" :name="$t('generic.label.total')"></bcs-option>
+                <bcs-option
+                  v-for="memItem in memList"
+                  :key="memItem"
+                  :id="memItem"
+                  :name="memItem">
+                </bcs-option>
+              </bcs-select>
+              <span :class="['company', { disabled: isEdit }]">G</span>
+            </div>
+          </div>
+          <bcs-table
+            :data="instanceList"
+            v-bkloading="{ isLoading: instanceTypesLoading || clusterDetailLoading }"
+            :pagination="pagination"
+            :row-class-name="instanceRowClass"
+            @page-change="pageChange"
+            @page-limit-change="pageSizeChange"
+            @row-click="handleCheckInstanceType">
+            <bcs-table-column :label="$t('generic.ipSelector.label.serverModel')" prop="typeName" show-overflow-tooltip>
+              <template #default="{ row }">
+                <span v-bk-tooltips="{ disabled: row.status !== 'SOLD_OUT', content: $t('cluster.ca.nodePool.create.instanceTypeConfig.status.soldOut') }">
+                  <bcs-radio
+                    :value="nodePoolConfig.launchTemplate.instanceType === row.nodeType"
+                    :disabled="row.status === 'SOLD_OUT'">
+                    <span class="bcs-ellipsis">{{row.typeName}}</span>
+                  </bcs-radio>
+                </span>
+              </template>
+            </bcs-table-column>
+            <bcs-table-column :label="$t('generic.label.specifications')" min-width="120" show-overflow-tooltip prop="nodeType"></bcs-table-column>
+            <bcs-table-column label="CPU" prop="cpu" width="80" align="right">
+              <template #default="{ row }">
+                <span>{{ `${row.cpu}${$t('units.suffix.cores')}` }}</span>
+              </template>
+            </bcs-table-column>
+            <bcs-table-column :label="$t('generic.label.mem')" prop="memory" width="80" align="right">
+              <template #default="{ row }">
+                <span>{{ row.memory }}G</span>
+              </template>
+            </bcs-table-column>
+            <bcs-table-column :label="$t('generic.label.status')" width="80">
+              <template #default="{ row }">
+                {{ row.status === 'SELL' ? $t('cluster.ca.nodePool.create.instanceTypeConfig.status.sell') : $t('cluster.ca.nodePool.create.instanceTypeConfig.status.soldOut') }}
+              </template>
+            </bcs-table-column>
+          </bcs-table>
+          <p class="text-[12px] text-[#ea3636]" v-if="!nodePoolConfig.launchTemplate.instanceType">{{ $t('generic.validate.required') }}</p>
+          <div class="mt25" style="display:flex;align-items:center;">
+            <div class="prefix-select">
+              <span :class="['prefix', { disabled: isEdit }]">{{$t('cluster.ca.nodePool.create.instanceTypeConfig.disk.system')}}</span>
+              <bcs-select
+                v-model="nodePoolConfig.launchTemplate.systemDisk.diskType"
+                :disabled="isEdit"
+                :clearable="false"
+                class="min-width-150 bg-[#fff]">
+                <bcs-option
+                  v-for="diskItem in diskEnum"
+                  :key="diskItem.id"
+                  :id="diskItem.id"
+                  :name="diskItem.name">
+                </bcs-option>
+              </bcs-select>
+            </div>
+            <bk-input
+              class="w-[88px] bg-[#fff] ml10"
+              type="number"
+              :disabled="isEdit"
+              :min="40"
+              :max="1024"
+              v-model="nodePoolConfig.launchTemplate.systemDisk.diskSize">
+            </bk-input>
+            <span :class="['company', { disabled: isEdit }]">GB</span>
+          </div>
+          <div class="mt20">
+            <bk-checkbox
+              :disabled="isEdit"
+              v-model="showDataDisks"
+              @change="handleShowDataDisksChange">
+              <span>
+                {{$t('cluster.ca.nodePool.create.instanceTypeConfig.label.purchaseDataDisk')}}
+              </span>
+            </bk-checkbox>
+          </div>
+          <template v-if="showDataDisks">
+            <div class="panel" v-for="(disk, index) in nodePoolConfig.nodeTemplate.dataDisks" :key="index">
+              <div class="panel-item">
+                <div class="prefix-select">
+                  <span :class="['prefix', { disabled: isEdit }]">{{$t('cluster.ca.nodePool.create.instanceTypeConfig.disk.data')}}</span>
+                  <bcs-select
+                    :disabled="isEdit"
+                    v-model="disk.diskType"
+                    :clearable="false"
+                    class="min-width-150 bg-[#fff] w-[150px]">
+                    <bcs-option
+                      v-for="diskItem in diskEnum"
+                      :key="diskItem.id"
+                      :id="diskItem.id"
+                      :name="diskItem.name">
+                    </bcs-option>
+                  </bcs-select>
+                </div>
+                <bk-input
+                  class="max-width-130 ml10"
+                  type="number"
+                  :disabled="isEdit"
+                  :min="50"
+                  :max="16380"
+                  v-model="disk.diskSize">
+                </bk-input>
+                <span :class="['company', { disabled: isEdit }]">GB</span>
+              </div>
+              <p class="error-tips" v-if="disk.diskSize % 10 !== 0">{{$t('cluster.ca.nodePool.create.instanceTypeConfig.validate.dataDisks')}}</p>
+              <span :class="['panel-delete', { disabled: isEdit }]" @click="handleDeleteDiskData(index)">
+                <i class="bk-icon icon-close3-shape"></i>
+              </span>
+            </div>
+            <div
+              :class="['add-panel-btn', { disabled: isEdit || nodePoolConfig.nodeTemplate.dataDisks.length > 4 }]"
+              v-bk-tooltips="{
+                content: $t('cluster.ca.nodePool.create.instanceTypeConfig.validate.maxDataDisks'),
+                disabled: nodePoolConfig.nodeTemplate.dataDisks.length <= 4
+              }"
+              @click="handleAddDiskData">
+              <i class="bk-icon left-icon icon-plus"></i>
+              <span>{{$t('cluster.ca.nodePool.create.instanceTypeConfig.button.addDataDisks')}}</span>
+            </div>
+          </template>
+          <span class="inline-flex mt15">
+            <bk-checkbox
+              :disabled="isEdit"
+              v-model="nodePoolConfig.launchTemplate.internetAccess.publicIPAssigned">
+              {{$t('cluster.ca.nodePool.create.instanceTypeConfig.publicIPAssigned.text')}}
+            </bk-checkbox>
+          </span>
+        </bk-form-item>
+        <bk-form-item
+          :label="$t('cluster.ca.nodePool.create.subnet.title')"
+          property="nodePoolConfig.autoScaling.subnetIDs"
+          error-display-type="normal"
+          required>
+          <bcs-table
+            :data="filterSubnetsList"
+            row-class-name="table-row-enable"
+            v-bkloading="{ isLoading: subnetsLoading }"
+            @row-click="handleCheckSubnets">
+            <bcs-table-column :label="$t('cluster.ca.nodePool.create.subnet.label.subnetID')" min-width="240">
+              <template #default="{ row }">
+                <bk-checkbox
+                  :value="nodePoolConfig.autoScaling.subnetIDs.includes(row.subnetID)">
+                  <span class="bcs-ellipsis">{{row.subnetID}}</span>
+                </bk-checkbox>
+              </template>
+            </bcs-table-column>
+            <bcs-table-column :label="$t('cluster.ca.nodePool.create.subnet.label.subnetName')" min-width="130" prop="subnetName" show-overflow-tooltip></bcs-table-column>
+            <bcs-table-column :label="$t('cluster.ca.nodePool.create.subnet.label.zone')" prop="zone" show-overflow-tooltip></bcs-table-column>
+            <bcs-table-column :label="$t('cluster.ca.nodePool.create.subnet.label.remainIp')" prop="availableIPAddressCount" align="right"></bcs-table-column>
+          </bcs-table>
+          <p v-if="isShowTip" class="text-[12px] text-[#979BA5] leading-[18px] mt-[2px]">{{ $t('cluster.ca.nodePool.create.subnet.validate') }}</p>
+        </bk-form-item>
+      </bk-form>
+    </div>
+    <div class="bcs-border-top z-10 flex items-center sticky bottom-0 bg-[#fff] h-[60px] px-[24px]">
+      <bcs-button theme="primary" @click="handleNext">{{$t('generic.button.next')}}</bcs-button>
+      <bcs-button class="ml10" @click="handleCancel">{{$t('generic.button.cancel')}}</bcs-button>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+import { sortBy } from 'lodash';
+import { computed, defineComponent, onMounted, ref, toRefs, watch } from 'vue';
+
+import { cloudNoderoles } from '@/api/base';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
+import usePage from '@/composables/use-page';
+import $i18n from '@/i18n/i18n-setup';
+import $store from '@/store/index';
+
+export default defineComponent({
+  props: {
+    defaultValues: {
+      type: Object,
+      default: () => ({}),
+    },
+    cluster: {
+      type: Object,
+      default: () => ({}),
+    },
+    isEdit: {
+      type: Boolean,
+      default: false,
+    },
+    saveLoading: {
+      type: Boolean,
+      default: false,
+    },
+    cloudAccountID: {
+      type: String,
+      default: '',
+    },
+    cloudID: {
+      type: String,
+      default: '',
+    },
+    region: {
+      type: String,
+      default: '',
+    },
+    vpcID: {
+      type: String,
+      default: '',
+    },
+  },
+  setup(props, ctx) {
+    const { defaultValues, isEdit } = toRefs(props);
+    const nodeConfigRef = ref<any>(null);
+    const formRef = ref<any>(null);
+    const basicFormRef = ref<any>(null);
+    // 磁盘类型
+    const diskEnum = ref([
+      {
+        id: 'gp2',
+        name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.gp2'),
+      },
+      {
+        id: 'gp3',
+        name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.gp3'),
+      },
+      {
+        id: 'io1',
+        name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.io1'),
+      },
+      {
+        id: 'io2',
+        name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.io2'),
+      },
+      {
+        id: 'st1',
+        name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.st1'),
+      },
+      {
+        id: 'sc1',
+        name: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.sc1'),
+      },
+    ]);
+    const user = computed(() => $store.state.user);
+    const nodePoolConfig = ref({
+      $id: `id_${Date.now()}`,
+      status: 'CREATING',
+      creator: user.value.username, // 创建人
+      nodeGroupID: defaultValues.value.nodeGroupID, // 编辑时
+      name: defaultValues.value.name || '', // 节点名称
+      nodeOS: defaultValues.value.launchTemplate?.imageInfo?.imageName || '', // 节点操作系统
+      autoScaling: {
+        serviceRole: defaultValues.value.autoScaling.serviceRole || '', // iam角色
+        vpcID: '', // todo 放在basic-pool-info组件比较合适
+        subnetIDs: defaultValues.value.autoScaling.subnetIDs || [], // 支持子网
+      },
+      launchTemplate: {
+        imageInfo: {
+          imageName: defaultValues.value.launchTemplate?.imageInfo?.imageName, // 镜像名称
+          imageType: defaultValues.value.launchTemplate?.imageInfo?.imageType || 'PUBLIC_IMAGE', // 镜像类型
+        },
+        CPU: '',
+        Mem: '',
+        instanceType: defaultValues.value.launchTemplate?.instanceType, // 机型信息
+        InstanceChargeType: 'ON_DEMAND', // 实例计费方式
+        systemDisk: {
+          diskType: diskEnum.value.some(item => item.id === defaultValues.value.launchTemplate?.systemDisk?.diskType)
+            ? defaultValues.value.launchTemplate?.systemDisk?.diskType
+            : 'gp3', // 系统盘类型
+          diskSize: defaultValues.value.launchTemplate?.systemDisk?.diskSize, // 系统盘大小
+        },
+        internetAccess: {
+          publicIPAssigned: defaultValues.value.launchTemplate?.internetAccess?.publicIPAssigned, // 分配免费公网IP
+        },
+        // 密钥信息
+        keyPair: {
+          keyID: defaultValues.value.launchTemplate?.keyPair?.keyID || '',
+          keySecret: defaultValues.value.launchTemplate?.keyPair?.keySecret || '',
+        },
+        initLoginUsername: 'ec2-user', // 用户名
+        initLoginPassword: defaultValues.value.launchTemplate?.initLoginPassword, // 密码
+        securityGroupIDs: defaultValues.value.launchTemplate?.securityGroupIDs || [], // 安全组
+        dataDisks: defaultValues.value.launchTemplate?.dataDisks || [], // 数据盘
+        // 默认值
+        isSecurityService: defaultValues.value.launchTemplate?.isSecurityService || true,
+        isMonitorService: defaultValues.value.launchTemplate?.isMonitorService || true,
+      },
+      nodeTemplate: {
+        dataDisks: defaultValues.value.nodeTemplate?.dataDisks || [],
+      },
+      extra: {
+        provider: '', // 机型provider信息
+      },
+    });
+
+    const nodePoolConfigRules = ref({
+      name: [
+        {
+          required: true,
+          message: $i18n.t('generic.validate.required'),
+          trigger: 'blur',
+        },
+        {
+          message: $i18n.t('cluster.ca.nodePool.create.validate.name'),
+          trigger: 'blur',
+          validator: (v: string) => /^[\u4E00-\u9FA5A-Za-z0-9._-]+$/.test(v) && v.length <= 255 && v.length >= 2,
+        },
+      ],
+      // IAM角色
+      'nodePoolConfig.autoScaling.serviceRole': [
+        {
+          message: $i18n.t('generic.validate.required'),
+          trigger: 'blur',
+          validator: () => nodePoolConfig.value.autoScaling.serviceRole,
+        },
+      ],
+      // 子网校验
+      'nodePoolConfig.autoScaling.subnetIDs': [
+        {
+          message: $i18n.t('generic.validate.required'),
+          trigger: 'blur',
+          validator: () => !!nodePoolConfig.value.autoScaling.subnetIDs.length,
+        },
+        {
+          message: $i18n.t('cluster.ca.nodePool.create.subnet.validate'),
+          trigger: 'blur',
+          validator: () => nodePoolConfig.value.autoScaling.subnetIDs.length >= 2,
+        },
+      ],
+    });
+
+    // IAM角色
+    const nodeRoles = ref<any[]>([]);
+    const nodeRolesLoading = ref(false);
+    const handleGetNodeRoles = async () => {
+      nodeRolesLoading.value = true;
+      nodeRoles.value = await cloudNoderoles({
+        $cloudID: props.cloudID,
+        accountID: props.cloudAccountID,
+        operator: $store.state.user.username,
+        roleType: 'nodeGroup',
+      }).catch(() => []);
+      nodeRolesLoading.value = false;
+    };
+    // 镜像
+    watch(() => nodePoolConfig.value.launchTemplate.imageInfo.imageType, () => {
+      // 获取镜像列表
+      handleGetOsImage();
+    });
+    const osImageLoading = ref(false);
+    const osImageList = ref<Array<{
+      imageID: string
+      alias: string
+    }>>([]);
+    const handleGetOsImage = async () => {
+      osImageLoading.value = true;
+      osImageList.value = await $store.dispatch('clustermanager/cloudOsImage', {
+        $cloudID: props.cloudID,
+        region: props.region,
+        accountID: props.cloudAccountID,
+        provider: nodePoolConfig.value.launchTemplate.imageInfo.imageType,
+      });
+      // eslint-disable-next-line max-len
+      nodePoolConfig.value.launchTemplate.imageInfo.imageName = (nodePoolConfig.value.launchTemplate.imageInfo.imageName || osImageList.value[0]?.imageID);
+      nodePoolConfig.value.nodeOS = nodePoolConfig.value.launchTemplate.imageInfo.imageName;
+      osImageLoading.value = false;
+    };
+
+    // 机型
+    const instanceTypesLoading = ref(false);
+    const instanceData = ref<any[]>([]);
+    const instanceTypesList = computed(() => {
+      const cacheInstanceMap = {};
+      // 先过滤可用区, 再过滤同类型机型
+      return instanceData.value
+        .filter((instance) => {
+        // todo 简单过滤同类型机型
+          if (!cacheInstanceMap[instance.nodeType]) {
+            cacheInstanceMap[instance.nodeType] = true;
+            return true;
+          }
+          return false;
+        })
+        .filter(instance => (!CPU.value || instance.cpu === CPU.value)
+        && (!Mem.value || instance.memory === Mem.value));
+    });
+    let timer: any = null;
+    watch(() => instanceTypesList.value.length, () => {
+      const index = instanceTypesList.value.findIndex(item => item.nodeType === nodePoolConfig.value.launchTemplate.instanceType);
+      timer && clearTimeout(timer);
+      timer = setTimeout(() => {
+        pageChange(Math.ceil((index + 1) / pagination.value.limit));
+      }, 100);
+      handleResetPage();
+    });
+    // eslint-disable-next-line max-len
+    const curInstanceItem = computed(() => instanceData.value.find(instance => instance.nodeType === nodePoolConfig.value.launchTemplate.instanceType) || {});
+    const cpuList = computed(() => {
+      const data = instanceData.value.reduce((pre, item) => {
+        if (!pre.includes(item.cpu)) {
+          pre.push(item.cpu);
+        }
+        return pre;
+      }, []);
+      return sortBy(data);
+    });
+    const memList = computed(() => {
+      const data = instanceData.value.reduce((pre, item) => {
+        if (!pre.includes(item.memory)) {
+          pre.push(item.memory);
+        }
+        return pre;
+      }, []);
+      return sortBy(data);
+    });
+
+    const CPU = ref('');
+    const Mem = ref('');
+    watch(() => [
+      CPU.value,
+      Mem.value,
+    ], () => {
+      // 重置机型
+      nodePoolConfig.value.launchTemplate.instanceType = '';
+      handleSetDefaultInstance();
+    });
+    watch(curInstanceItem, () => {
+      nodePoolConfig.value.extra.provider = curInstanceItem.value.provider;
+    });
+    watch(() => nodePoolConfig.value.launchTemplate.instanceType, () => {
+      // 机型变更时重置子网数据
+      nodePoolConfig.value.autoScaling.subnetIDs = [];
+    });
+    const instanceRowClass = ({ row }) => {
+      // SELL 表示售卖，SOLD_OUT 表示售罄
+      if (row.status === 'SELL' || isEdit.value) {
+        return 'table-row-enable';
+      }
+      return 'table-row-disabled';
+    };
+    const handleCheckInstanceType = (row) => {
+      if (row.status === 'SOLD_OUT') return;
+      nodePoolConfig.value.launchTemplate.instanceType = row.nodeType;
+    };
+    // 设置默认机型
+    const handleSetDefaultInstance = () => {
+      setTimeout(() => {
+        // 默认机型配置
+        if (!nodePoolConfig.value.launchTemplate.instanceType) {
+          nodePoolConfig.value.launchTemplate.instanceType = instanceTypesList.value
+            .find(instance => instance.status === 'SELL')?.nodeType;
+        }
+      });
+    };
+    const handleGetInstanceTypes = async () => {
+      instanceTypesLoading.value = true;
+      const data = await $store.dispatch('clustermanager/cloudInstanceTypes', {
+        $cloudID: props.cloudID,
+        region: props.region,
+        accountID: props.cloudAccountID,
+        provider: nodePoolConfig.value.launchTemplate.imageInfo.imageType,
+      });
+      instanceData.value = data.sort((pre, current) => {
+        // 排序要求 状态--SELL在前，其他在后；CPU升序，
+        if (pre.status === 'SELL') {
+          return current.status === 'SELL' ? pre.cpu - current.cpu : -1;
+        }
+        // 当 pre.status 不等于 'SELL'
+        return current.status !== 'SELL' ? pre.cpu - current.cpu : 1;
+      });
+      handleSetDefaultInstance();
+      instanceTypesLoading.value = false;
+    };
+    const {
+      pagination,
+      curPageData: instanceList,
+      pageChange,
+      pageSizeChange,
+      handleResetPage,
+    } = usePage(instanceTypesList);
+
+    // 数据盘
+    const showDataDisks = ref(!!nodePoolConfig.value.nodeTemplate.dataDisks.length);
+    const defaultDiskItem = defaultValues.value?.hardwareProfile?.dataDisks.length
+      ? defaultValues.value.hardwareProfile.dataDisks[0]
+      : {
+        // 默认为gp2
+        diskType: 'gp2',
+        diskSize: '100',
+        autoFormatAndMount: true,
+      };
+    const handleShowDataDisksChange = (show) => {
+      nodePoolConfig.value.nodeTemplate.dataDisks = show
+        ? [JSON.parse(JSON.stringify(defaultDiskItem))] : [];
+    };
+    const handleDeleteDiskData = (index) => {
+      if (isEdit.value) return;
+      nodePoolConfig.value.nodeTemplate.dataDisks.splice(index, 1);
+    };
+    const handleAddDiskData = () => {
+      if (isEdit.value || nodePoolConfig.value.nodeTemplate.dataDisks.length > 4) return;
+      nodePoolConfig.value.nodeTemplate.dataDisks.push(JSON.parse(JSON.stringify(defaultDiskItem)));
+    };
+
+    // VPC子网
+    const isShowTip = ref(true);
+    const subnetsLoading = ref(false);
+    const subnetsList = ref<Array<{
+      zone: string
+      zoneName: string
+      subnetID: string
+    }>>([]);
+    const filterSubnetsList = computed(() => subnetsList.value);
+    const subnetsRowClass = ({ row }) => 'table-row-enable';
+    const handleGetSubnets = async () => {
+      subnetsLoading.value = true;
+      subnetsList.value = await $store.dispatch('clustermanager/cloudSubnets', {
+        $cloudID: props.cloudID,
+        region: props.region,
+        accountID: props.cloudAccountID,
+        vpcID: props.vpcID,
+      });
+      subnetsLoading.value = false;
+    };
+    const handleCheckSubnets = (row) => {
+      const index = nodePoolConfig.value.autoScaling.subnetIDs.indexOf(row.subnetID);
+      if (index > -1) {
+        nodePoolConfig.value.autoScaling.subnetIDs.splice(index, 1);
+      } else {
+        nodePoolConfig.value.autoScaling.subnetIDs.push(row.subnetID);
+      }
+    };
+
+    // 操作
+    const getNodePoolData = () => {
+      // 系统盘、数据盘、宽度大小要转换为字符串类型
+      // eslint-disable-next-line max-len
+      nodePoolConfig.value.launchTemplate.systemDisk.diskSize = String(nodePoolConfig.value.launchTemplate.systemDisk.diskSize);
+      nodePoolConfig.value.nodeTemplate.dataDisks = nodePoolConfig.value.nodeTemplate.dataDisks.map(item => ({
+        ...item,
+        diskSize: String(item.diskSize),
+      }));
+      // 数据盘后端存了两个地方
+      nodePoolConfig.value.launchTemplate.dataDisks = nodePoolConfig.value.nodeTemplate.dataDisks.map(item => ({
+        diskType: item.diskType,
+        diskSize: item.diskSize,
+      }));
+      // CPU和mem信息从机型获取
+      nodePoolConfig.value.launchTemplate.CPU = curInstanceItem.value.cpu;
+      nodePoolConfig.value.launchTemplate.Mem = curInstanceItem.value.memory;
+      return nodePoolConfig.value;
+    };
+    const validate = async () => {
+      // const basicFormValidate = await basicFormRef.value?.validate().catch(() => false);
+      // if (!basicFormValidate && nodeConfigRef.value) {
+      //   nodeConfigRef.value.scrollTop = 0;
+      //   return false;
+      // }
+      // 校验机型
+      if (!nodePoolConfig.value.launchTemplate.instanceType) {
+        nodeConfigRef.value.scrollTop = 20;
+        return false;
+      }
+      const result = await formRef.value?.validate().catch(() => false);
+      if (!result && nodeConfigRef.value) {
+        nodeConfigRef.value.scrollTop = nodeConfigRef.value.scrollHeight;
+      }
+      // eslint-disable-next-line max-len
+      const validateDataDiskSize = nodePoolConfig.value.nodeTemplate.dataDisks.every(item => item.diskSize % 10 === 0);
+      // if (!basicFormValidate || !result || !validateDataDiskSize) return false;
+      if (!result || !validateDataDiskSize) return false;
+
+      return true;
+    };
+
+    const { focusOnErrorField } = useFocusOnErrorField();
+    const handleNext = async () => {
+      isShowTip.value = false;
+      // 校验错误滚动到第一个错误的位置
+      const result = await validate();
+      if (!result) {
+        // 自动滚动到第一个错误的位置
+        focusOnErrorField();
+        return;
+      }
+      ctx.emit('next', getNodePoolData());
+    };
+
+    const handleCancel = () => {
+      ctx.emit('close');
+    };
+
+    // 集群详情
+    const clusterDetailLoading = ref(false);
+
+    onMounted(async () => {
+      // nodeRoles
+      handleGetNodeRoles();
+      handleGetOsImage();
+      // 机型
+      handleGetInstanceTypes();
+      // 子网
+      handleGetSubnets();
+    });
+
+    return {
+      // 子网
+      subnetsLoading,
+      isShowTip,
+      subnetsList,
+      filterSubnetsList,
+      handleSetDefaultInstance,
+      nodeRoles,
+      nodeRolesLoading,
+      nodeConfigRef,
+      formRef,
+      basicFormRef,
+      diskEnum,
+      nodePoolConfig,
+      nodePoolConfigRules,
+      curInstanceItem,
+      instanceTypesLoading,
+      instanceList,
+      pagination,
+      pageChange,
+      handleResetPage,
+      pageSizeChange,
+      instanceRowClass,
+      handleCheckInstanceType,
+      handleShowDataDisksChange,
+      handleDeleteDiskData,
+      handleAddDiskData,
+      handleNext,
+      handleCancel,
+      validate,
+      getNodePoolData,
+      CPU,
+      Mem,
+      cpuList,
+      memList,
+      clusterDetailLoading,
+      instanceTypesList,
+      osImageLoading,
+      osImageList,
+      showDataDisks,
+      // 子网
+      subnetsRowClass,
+      handleCheckSubnets,
+    };
+  },
+});
+</script>
+<style lang="postcss" scoped>
+.node-config-wrapper {
+  overflow: auto;
+}
+.node-config {
+    font-size: 14px;
+    overflow: auto;
+    >>> .group-text {
+        line-height: 30px;
+        background-color: #fafbfd;
+    }
+    >>> .bk-form-content {
+        max-width: 650px;
+        .bk-form-radio {
+            white-space: nowrap;
+        }
+        .bk-form-checkbox {
+            white-space: nowrap;
+        }
+    }
+    >>> .table-row-enable {
+        cursor: pointer;
+    }
+    >>> .table-row-disabled {
+        cursor: not-allowed;
+        color: #C4C6CC;
+        .bk-checkbox-text {
+            color: #C4C6CC;
+        }
+    }
+    .max-width-130 {
+        max-width: 130px;
+    }
+    .max-width-150 {
+        max-width: 150px;
+    }
+    .min-width-80 {
+        min-width: 80px;
+    }
+    .min-width-150 {
+        min-width: 150px;
+    }
+    .prefix-select {
+        display: flex;
+        .prefix {
+            display: inline-block;
+            height: 32px;
+            background: #F0F1F5;
+            border: 1px solid #C4C6CC;
+            border-radius: 2px 0 0 2px;
+            border-radius: 2px 0 0 2px;
+            padding: 0 8px;
+            &.disabled {
+              border-color: #dcdee5;
+            }
+        }
+        >>> .bk-select {
+            min-width: 110px;
+            margin-left: -1px;
+        }
+    }
+    .company {
+        display: inline-block;
+        min-width: 30px;
+        padding: 0 4px 0 4px;
+        height: 32px;
+        line-height: 30px;
+        border: 1px solid #C4C6CC;
+        text-align: center;
+        border-left: none;
+        background-color: #fafbfd;
+        &.disabled {
+          border-color: #dcdee5;
+        }
+    }
+    >>> .panel {
+        background: #F5F7FA;
+        padding: 16px 24px;
+        margin-top: 2px;
+        margin-bottom: 16px;
+        position: relative;
+        &-item {
+            display: flex;
+            align-items: center;
+            height: 32px;
+            .label {
+                display: inline-block;
+                width: 80px;
+            }
+
+        }
+        &-delete {
+            position: absolute;
+            cursor: pointer;
+            color: #979ba5;
+            top: 0;
+            right: 8px;
+            &:hover {
+                color: #3a84ff;
+            }
+            &.disabled {
+                color: #C4C6CC;
+                cursor: not-allowed;
+            }
+        }
+        .bk-form-control {
+            display: flex;
+            width: auto;
+            align-items: center;
+        }
+    }
+    >>> .add-panel-btn {
+        cursor: pointer;
+        background: #fafbfd;
+        border: 1px dashed #c4c6cc;
+        border-radius: 2px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        height: 32px;
+        font-size: 12px;
+        .bk-icon {
+            font-size: 20px;
+        }
+        &:hover {
+            border-color: #3a84ff;
+            color: #3a84ff;
+        }
+        &.disabled {
+            color: #C4C6CC;
+            cursor: not-allowed;
+            border-color: #C4C6CC;
+        }
+    }
+    .bcs-icon-info-circle-shape {
+        color: #979ba5;
+    }
+    .error-tips {
+        color: red;
+        font-size: 12px;
+    }
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/node-pool-info.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/node-pool-info.vue
new file mode 100644
index 0000000000..d7a7414b85
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/node-pool-info.vue
@@ -0,0 +1,287 @@
+<template>
+  <div class="h-full">
+    <div class="p-[24px] h-full overflow-auto" ref="nodePoolInfoRef">
+      <FormGroup :title="$t('generic.title.basicInfo1')" :allow-toggle="false">
+        <BasicPoolInfo
+          :default-values="defaultValues"
+          :is-edit="isEdit"
+          :cluster="cluster"
+          ref="basicInfoRef">
+        </BasicPoolInfo>
+      </FormGroup>
+      <div class="px-[16px]"><bcs-divider class="!my-[0px]"></bcs-divider></div>
+      <FormGroup :title="$t('cluster.ca.nodePool.create.scaleInitConfig.title')" :allow-toggle="false">
+        <p>{{$t('cluster.nodeTemplate.label.postInstall.title')}}</p>
+        <div class="mt-[10px]">
+          <bcs-select class="max-w-[524px]" :clearable="false" v-model="scaleOutPostActionType">
+            <bcs-option id="simple" :name="$t('cluster.nodeTemplate.label.postInstall.type.scripts')"></bcs-option>
+            <bcs-option id="complex" :name="$t('cluster.nodeTemplate.label.postInstall.type.sops')"></bcs-option>
+          </bcs-select>
+          <bcs-input
+            type="textarea"
+            class="mt10"
+            :rows="6"
+            :placeholder="$t('cluster.ca.nodePool.create.scaleInitConfig.placeholder')"
+            v-if="scaleOutPostActionType === 'simple'"
+            v-model="nodePoolInfoData.nodeTemplate.userScript">
+          </bcs-input>
+          <BkSops
+            class="mt10"
+            actions-key="postActions"
+            :cluster-id="cluster.clusterID"
+            :addons="nodePoolInfoData.nodeTemplate.scaleOutExtraAddons"
+            :allow-skip-when-failed="allowSkipScaleOutWhenFailed"
+            ref="scaleOutRef"
+            v-else>
+          </BkSops>
+        </div>
+        <p class="mt-[10px]">{{$t('generic.label.whenFailed')}}</p>
+        <bk-radio-group class="mt-[8px]" v-model="allowSkipScaleOutWhenFailed">
+          <bk-radio :value="false" class="text-[12px]">
+            {{ $t('cluster.ca.nodePool.create.scaleInitConfig.postInit.errorHandling.radio1') }}
+            <span class="text-[#699DF4]">
+              [{{ $t('cluster.ca.nodePool.create.scaleInitConfig.label.keyStepsRecommended') }}]
+            </span>
+            <i
+              class="bk-icon icon-info-circle"
+              v-bk-tooltips="$t('cluster.ca.nodePool.create.scaleInitConfig.postInit.errorHandling.tips1')">
+            </i>
+          </bk-radio>
+          <bk-radio :value="true" class="text-[12px]">
+            {{ $t('cluster.ca.nodePool.create.scaleInitConfig.postInit.errorHandling.radio2') }}
+            <span class="text-[#979BA5]">
+              [{{ $t('cluster.ca.nodePool.create.scaleInitConfig.label.unKeyStepsRecommended') }}]
+            </span>
+            <i
+              class="bk-icon icon-info-circle"
+              v-bk-tooltips="$t('cluster.ca.nodePool.create.scaleInitConfig.postInit.errorHandling.tips2')">
+            </i>
+          </bk-radio>
+        </bk-radio-group>
+      </FormGroup>
+      <div class="px-[16px]"><bcs-divider class="!my-[0px]"></bcs-divider></div>
+      <FormGroup :title="$t('cluster.ca.nodePool.create.scaleInitConfig.scaleInPreScript')" :allow-toggle="false">
+        <bcs-select class="max-w-[524px]" :clearable="false" v-model="scaleInPreActionType">
+          <bcs-option id="simple" :name="$t('cluster.nodeTemplate.label.postInstall.type.scripts')"></bcs-option>
+          <bcs-option id="complex" :name="$t('cluster.nodeTemplate.label.postInstall.type.sops')"></bcs-option>
+        </bcs-select>
+        <bcs-input
+          type="textarea"
+          class="mt10"
+          :rows="6"
+          :placeholder="$t('cluster.ca.nodePool.create.scaleInitConfig.placeholder')"
+          v-if="scaleInPreActionType === 'simple'"
+          v-model="nodePoolInfoData.nodeTemplate.scaleInPreScript">
+        </bcs-input>
+        <BkSops
+          class="mt10"
+          actions-key="preActions"
+          :addons="nodePoolInfoData.nodeTemplate.scaleInExtraAddons"
+          :cluster-id="cluster.clusterID"
+          :allow-skip-when-failed="allowSkipScaleInWhenFailed"
+          ref="scaleInRef"
+          v-else>
+        </BkSops>
+        <p class="mt-[10px]">{{$t('generic.label.whenFailed')}}</p>
+        <bk-radio-group class="mt-[8px]" v-model="allowSkipScaleInWhenFailed">
+          <bk-radio :value="false" class="text-[12px]">
+            {{ $t('cluster.ca.nodePool.create.scaleInitConfig.recycleClean.errorHandling.radio1') }}
+            <span class="text-[#699DF4]">
+              [{{ $t('cluster.ca.nodePool.create.scaleInitConfig.label.keyStepsRecommended') }}]
+            </span>
+            <i
+              class="bk-icon icon-info-circle"
+              v-bk-tooltips="$t('cluster.ca.nodePool.create.scaleInitConfig.recycleClean.errorHandling.tips1')">
+            </i>
+          </bk-radio>
+          <bk-radio :value="true" class="text-[12px]">
+            {{ $t('cluster.ca.nodePool.create.scaleInitConfig.recycleClean.errorHandling.radio2') }}
+            <span class="text-[#979BA5]">
+              [{{ $t('cluster.ca.nodePool.create.scaleInitConfig.label.unKeyStepsRecommended') }}]
+            </span>
+            <i
+              class="bk-icon icon-info-circle"
+              v-bk-tooltips="$t('cluster.ca.nodePool.create.scaleInitConfig.recycleClean.errorHandling.tips2')">
+            </i>
+          </bk-radio>
+        </bk-radio-group>
+      </FormGroup>
+    </div>
+    <div class="bcs-border-top z-10 flex items-center sticky bottom-0 bg-[#fff] h-[60px] px-[24px]" v-if="showFooter">
+      <bcs-button @click="handlePre">{{$t('generic.button.pre')}}</bcs-button>
+      <bcs-button
+        theme="primary"
+        :loading="saveLoading"
+        class="ml10"
+        @click="handleSaveNodePoolData">
+        {{$t('cluster.ca.nodePool.create.button.save')}}
+      </bcs-button>
+      <bk-button class="ml10" @click="handleCancel">{{ $t('generic.button.cancel') }}</bk-button>
+    </div>
+  </div>
+</template>
+<script lang="ts">
+import { defineComponent, onMounted, ref, toRefs } from 'vue';
+
+import BasicPoolInfo from './basic-pool-info.vue';
+
+import { mergeDeep } from '@/common/util';
+import FormGroup from '@/components/form-group.vue';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
+import BkSops from '@/views/cluster-manage/components/bk-sops.vue';
+
+export default defineComponent({
+  name: 'AwsNodePoolInfo',
+  components: { FormGroup, BasicPoolInfo, BkSops },
+  props: {
+    // 详情数据或者默认值
+    defaultValues: {
+      type: Object,
+      default: () => ({}),
+    },
+    isEdit: {
+      type: Boolean,
+      default: false,
+    },
+    cluster: {
+      type: Object,
+      default: () => ({}),
+    },
+    showFooter: {
+      type: Boolean,
+      default: true,
+    },
+    saveLoading: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props, ctx) {
+    const { defaultValues } = toRefs(props);
+    const nodePoolInfoData = ref({
+      nodeTemplate: {
+        extraArgs: {
+          kubelet: defaultValues.value?.nodeTemplate?.extraArgs?.kubelet || '',
+        },
+        preStartUserScript: defaultValues.value?.nodeTemplate?.preStartUserScript || '', // 扩容前置脚本
+        userScript: defaultValues.value?.nodeTemplate?.userScript || '', // 扩容后置脚本
+        scaleOutExtraAddons: defaultValues.value?.nodeTemplate?.scaleOutExtraAddons || {}, // 扩容后置流程
+        scaleInPreScript: defaultValues.value?.nodeTemplate?.scaleInPreScript || '', // 缩容前置脚本
+        scaleInExtraAddons: defaultValues.value?.nodeTemplate?.scaleInExtraAddons || {}, // 缩容后置流程
+        labels: {}, // basic-pool-info里面赋值
+        allowSkipScaleOutWhenFailed: defaultValues.value?.nodeTemplate?.allowSkipScaleOutWhenFailed,
+        allowSkipScaleInWhenFailed: defaultValues.value?.nodeTemplate?.allowSkipScaleInWhenFailed,
+      },
+      labels: {},
+    });
+
+    const scaleOutPostActionType = ref<'complex' | 'simple'>('simple');
+    const scaleInPreActionType = ref<'complex' | 'simple'>('simple');
+
+    const nodePoolInfoRef = ref<any>(null);
+    const basicInfoRef = ref<any>(null);
+    const scaleInRef = ref<any>(null);
+    const scaleOutRef = ref<any>(null);
+
+    const getNodePoolData = () => {
+      // 处理基本参数
+      nodePoolInfoData.value = mergeDeep(nodePoolInfoData.value, basicInfoRef.value?.nodePoolInfo || {});
+      // 处理扩容脚本参数
+      if (scaleOutPostActionType.value === 'complex') {
+        nodePoolInfoData.value.nodeTemplate.userScript = '';
+        nodePoolInfoData.value.nodeTemplate.scaleOutExtraAddons = scaleOutRef.value?.bkSopsData;
+      } else {
+        nodePoolInfoData.value.nodeTemplate.scaleOutExtraAddons = {};
+        nodePoolInfoData.value.nodeTemplate.allowSkipScaleOutWhenFailed = allowSkipScaleOutWhenFailed.value;
+      }
+
+      // 处理缩容前置脚本参数
+      if (scaleInPreActionType.value === 'complex') {
+        nodePoolInfoData.value.nodeTemplate.scaleInPreScript = '';
+        nodePoolInfoData.value.nodeTemplate.scaleInExtraAddons = scaleInRef.value?.bkSopsData;
+      } else {
+        nodePoolInfoData.value.nodeTemplate.scaleInExtraAddons = {};
+        nodePoolInfoData.value.nodeTemplate.allowSkipScaleInWhenFailed = allowSkipScaleInWhenFailed.value;
+      }
+
+      // 处理label参数 后端label放两地方
+      nodePoolInfoData.value.labels = nodePoolInfoData.value.nodeTemplate.labels;
+      return nodePoolInfoData.value;
+    };
+    const { focusOnErrorField } = useFocusOnErrorField();
+    const validate = async () => {
+      const basicFormValidate = await basicInfoRef.value?.validate().catch(() => false);
+      if (!basicFormValidate) {
+        // 滚动到顶部
+        focusOnErrorField();
+        return false;
+      }
+
+      return true;
+    };
+    const handlePre = () => {
+      ctx.emit('pre');
+    };
+    const handleSaveNodePoolData = async () => {
+      const result = await validate();
+      if (!result) return;
+
+      ctx.emit('next', getNodePoolData());
+      ctx.emit('add');
+      handleCancel();
+    };
+    function handleCancel() {
+      ctx.emit('close');
+    };
+
+    const collapse = ref(false);
+    const handleCollapseChange = (value) => {
+      collapse.value = value;
+    };
+
+    // 脚本失败后能够跳过配置
+    const allowSkipScaleOutWhenFailed = ref(false);
+    const allowSkipScaleInWhenFailed = ref(true);
+
+    onMounted(() => {
+      scaleOutPostActionType.value = nodePoolInfoData.value.nodeTemplate.scaleOutExtraAddons?.postActions?.length ? 'complex' : 'simple';
+      scaleInPreActionType.value = nodePoolInfoData.value.nodeTemplate.scaleInExtraAddons?.preActions?.length ? 'complex' : 'simple';
+      if (scaleOutPostActionType.value === 'complex') {
+        const addons = nodePoolInfoData.value.nodeTemplate?.scaleOutExtraAddons;
+        const plugin = addons?.postActions?.[0];// 取postAction第1个（目前只支持一个），但是后端设计为了数组
+        allowSkipScaleOutWhenFailed.value = !!addons?.plugins?.[plugin]?.allowSkipWhenFailed;
+      } else {
+        allowSkipScaleOutWhenFailed.value = !!nodePoolInfoData.value.nodeTemplate.allowSkipScaleOutWhenFailed;
+      }
+
+      if (scaleInPreActionType.value === 'complex') {
+        const addons = nodePoolInfoData.value.nodeTemplate?.scaleInExtraAddons;
+        const plugin = addons?.preActions?.[0];// 取preAction第1个（目前只支持一个），但是后端设计为了数组
+        allowSkipScaleInWhenFailed.value = !!addons?.plugins?.[plugin]?.allowSkipWhenFailed;
+      } else {
+        allowSkipScaleInWhenFailed.value = nodePoolInfoData.value.nodeTemplate.allowSkipScaleInWhenFailed !== undefined
+          ? !!nodePoolInfoData.value.nodeTemplate.allowSkipScaleInWhenFailed
+          : true;
+      }
+    });
+    return {
+      collapse,
+      nodePoolInfoRef,
+      basicInfoRef,
+      scaleInRef,
+      scaleOutRef,
+      scaleOutPostActionType,
+      scaleInPreActionType,
+      nodePoolInfoData,
+      allowSkipScaleOutWhenFailed,
+      allowSkipScaleInWhenFailed,
+      getNodePoolData,
+      validate,
+      handlePre,
+      handleCancel,
+      handleCollapseChange,
+      handleSaveNodePoolData,
+    };
+  },
+});
+</script>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/vpc-cni.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/vpc-cni.vue
new file mode 100644
index 0000000000..20544b34ed
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/aws-cloud/vpc-cni.vue
@@ -0,0 +1,137 @@
+<template>
+  <div>
+    <div
+      class="flex flex-1 items-center mb-[10px]"
+      v-for="subnet, index in subnetSourceNew"
+      :key="index">
+      <template v-if="showZone">
+        <span class="prefix">{{ $t('tke.label.zone') }}</span>
+        <Zone
+          class="flex-1 ml-[-1px] mr-[8px]"
+          :region="region"
+          :cloud-account-i-d="cloudAccountID"
+          :cloud-i-d="cloudID"
+          :disabled-zone-list="getDisableZoneList(subnet.zone)"
+          :disabled-tips="$t('tke.tips.hasSelected')"
+          :init-data="index === 0"
+          :value-id="valueId"
+          v-model="subnet.zone" />
+      </template>
+      <span class="prefix">{{ $t('tke.label.ipNum') }}</span>
+      <bcs-select
+        class="flex-1 ml-[-1px]"
+        searchable
+        :clearable="false"
+        v-model="subnet.mask">
+        <bcs-option v-for="item in nodePodNumList" :id="item" :key="item" :name="item"></bcs-option>
+      </bcs-select>
+      <span class="flex items-center text-[#979BA5] ml-[8px] text-[14px]">
+        <i
+          class="bk-icon icon-plus-circle-shape mr-[5px] cursor-pointer"
+          @click="addSubnetSource()"></i>
+        <i
+          :class="[
+            'bk-icon icon-minus-circle-shape cursor-pointer',
+            subnetSourceNew.length <= 1
+              ? '!cursor-not-allowed !text-[#DCDEE5]' : ''
+          ]"
+          @click="removeSubnetSource(index)"></i>
+      </span>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { PropType, ref, watch } from 'vue';
+
+import Zone from '@/views/cluster-manage/add/components/zone.vue';
+
+const nodePodNumList = ref([12, 24, 32]);
+
+const props = defineProps({
+  subnets: {
+    type: Array as PropType<Array<{
+      zone: string
+      mask: number
+    }>>,
+    default: () => [],
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  cloudID: {
+    type: String,
+    default: '',
+  },
+  region: {
+    type: String,
+    default: '',
+  },
+  showZone: {
+    type: Boolean,
+    default: true,
+  },
+  valueId: {
+    type: String,
+    default: 'zone',
+  },
+});
+
+const emits = defineEmits(['change']);
+
+const subnetSourceNew = ref<Array<{
+  zone: string
+  mask: number
+}>>([]);
+
+watch(() => props.subnets, () => {
+  if (!props.subnets.length) {
+    subnetSourceNew.value = [{
+      mask: 24,
+      zone: '',
+    }];
+    return;
+  }
+
+  const newSubnets = JSON.stringify(props.subnets);
+  const oldSubnets = JSON.stringify(subnetSourceNew.value);
+  if (newSubnets === oldSubnets) return;
+
+  subnetSourceNew.value = JSON.parse(newSubnets);
+}, { immediate: true });
+
+watch(subnetSourceNew, () => {
+  emits('change', subnetSourceNew.value);
+}, { deep: true });
+
+// 一个可用区只能选择一次
+const getDisableZoneList = (excludeZone: string) => subnetSourceNew.value
+  .filter(item => item.zone !== excludeZone)
+  .map(item => item.zone);
+// vpc-cni 模式ip数量
+const addSubnetSource = () => {
+  subnetSourceNew.value.push({
+    zone: '',
+    mask: 24,
+  });
+};
+const removeSubnetSource = (index) => {
+  if (subnetSourceNew.value.length <= 1) return;
+  subnetSourceNew.value.splice(index, 1);
+};
+</script>
+<style scoped lang="postcss">
+>>> .prefix {
+  display: inline-block;
+  height: 32px;
+  line-height: 32px;
+  background: #F0F1F5;
+  border: 1px solid #C4C6CC;
+  border-radius: 2px 0 0 2px;
+  padding: 0 8px;
+  font-size: 12px;
+  &.disabled {
+    border-color: #dcdee5;
+  }
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/apply-host-resource.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/apply-host-resource.vue
new file mode 100644
index 0000000000..3d12b9e659
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/apply-host-resource.vue
@@ -0,0 +1,379 @@
+<template>
+  <div>
+    <bk-form-item :label="$t('tke.label.region')">
+      <Region
+        class="max-w-[600px]"
+        :value="region"
+        :cloud-account-i-d="cloudAccountID"
+        :cloud-i-d="cloudID"
+        disabled />
+    </bk-form-item>
+    <bk-form-item :label="$t('cluster.create.label.privateNet.text')">
+      <Vpc
+        class="max-w-[600px]"
+        :value="vpcID"
+        :region="region"
+        :cloud-account-i-d="cloudAccountID"
+        :cloud-i-d="cloudID"
+        disabled />
+    </bk-form-item>
+    <bk-form-item :label="$t('tke.label.system')">
+      <bcs-select disabled :value="imageID" class="max-w-[600px]">
+        <bcs-option v-for="item in imageList" :key="item.imageID" :id="item.imageID" :name="item.alias"></bcs-option>
+      </bcs-select>
+    </bk-form-item>
+    <bk-form-item :label="$t('tke.label.configRec')" v-if="showRecommendedConfig">
+      <bk-radio-group :value="level" class="flex flex-col" @change="handleLevelChange">
+        <bk-radio
+          v-for="item in masterConfigSchema"
+          :key="item.id"
+          :value="item.id"
+          class="!ml-[0px] !h-[32px] leading-[32px]">
+          {{ item.name }}
+          <span class="text-[#979BA5] ml-[8px]">{{ item.desc }}</span>
+        </bk-radio>
+      </bk-radio-group>
+    </bk-form-item>
+    <bk-form-item
+      :label="$t('tke.label.chargeType.text')"
+      :desc="chargeDesc"
+      property="instanceChargeType"
+      error-display-type="normal"
+      required>
+      <bk-radio-group
+        class="inline-flex items-center h-[32px]"
+        v-model="instanceCommonConfig.instanceChargeType"
+        @change="handleChargeTypeChange">
+        <bk-radio value="PREPAID">
+          {{ $t('tke.label.chargeType.prepaid') }}
+        </bk-radio>
+        <bk-radio value="POSTPAID_BY_HOUR">
+          {{ $t('tke.label.chargeType.postpaid_by_hour') }}
+        </bk-radio>
+        <bk-link
+          theme="primary"
+          class="ml-[30px]"
+          href="https://cloud.tencent.com/document/product/213/2180"
+          target="_blank">
+          <i class="bcs-icon bcs-icon-fenxiang mr-[2px]"></i>
+          {{ $t('tke.button.chargeTypeDiff') }}
+        </bk-link>
+      </bk-radio-group>
+      <div id="chargeDesc">
+        <div>{{ $t('tke.label.chargeType.prepaidDesc', [$t('tke.label.chargeType.prepaid')]) }}</div>
+        <div>{{ $t('tke.label.chargeType.postpaid_by_hour_desc', [$t('tke.label.chargeType.postpaid_by_hour')]) }}</div>
+      </div>
+    </bk-form-item>
+    <template v-if="instanceCommonConfig.instanceChargeType === 'PREPAID' && instanceCommonConfig.charge">
+      <bk-form-item :label="$t('tke.label.period')">
+        <bcs-select :clearable="false" searchable v-model="instanceCommonConfig.charge.period" class="max-w-[600px]">
+          <bcs-option v-for="item in periodList" :key="item.id" :id="item.id" :name="item.name"></bcs-option>
+        </bcs-select>
+      </bk-form-item>
+      <bk-form-item :label="$t('tke.label.autoRenewal.text')">
+        <bcs-checkbox
+          true-value="NOTIFY_AND_AUTO_RENEW"
+          false-value="NOTIFY_AND_MANUAL_RENEW"
+          v-model="instanceCommonConfig.charge.renewFlag">
+          {{ $t('tke.label.autoRenewal.desc') }}
+        </bcs-checkbox>
+      </bk-form-item>
+    </template>
+    <bk-form-item
+      :label="$t('tke.label.nodeConfig')"
+      required
+      property="instances"
+      error-display-type="normal"
+      ref="instancesRef">
+      <div class="flex items-center justify-between max-w-[600px]">
+        <bk-button theme="primary" icon="plus" outline @click="handleAddInstance">
+          {{ $t('tke.button.addNodeConfig') }}
+        </bk-button>
+        <i18n path="tke.tips.nodeNum" class="text-[12px]" v-if="applyNum">
+          <span class="text-[#3A84FF] font-bold">{{ applyNum }}</span>
+        </i18n>
+      </div>
+      <div
+        class="bg-[#F5F7FA] mt-[16px] p-[8px] rounded text-[12px] relative max-w-[600px]"
+        v-for="item, index in instances"
+        :key="index">
+        <div class="absolute top-[8px] right-[24px] text-[14px]">
+          <i
+            class="bk-icon icon-edit-line cursor-pointer mr-[16px] hover:text-[#3A84FF]"
+            @click="handleModifyInstance(index)"></i>
+          <i
+            class="bk-icon icon-close3-shape cursor-pointer hover:text-[#3A84FF]"
+            @click="handleDeleteInstance(index)">
+          </i>
+        </div>
+        <div class="flex items-center h-[32px]">
+          <label class="node-config-label">{{ $t('tke.label.zone') }}</label>
+          {{ getZoneName(item.zone) }}
+        </div>
+        <div class="flex items-center h-[32px]">
+          <label class="node-config-label">{{ $t('tke.label.subnet') }}</label>
+          {{ item.subnetID }}
+        </div>
+        <div class="flex items-center h-[32px]">
+          <label class="node-config-label">{{ $t('tke.label.instanceType') }}</label>
+          {{ item.instanceType }}
+        </div>
+        <div class="flex items-center h-[32px]">
+          <label class="node-config-label">{{ $t('tke.label.systemDisk') }}</label>
+          {{ `${diskMap[item.systemDisk.diskType]} ${item.systemDisk.diskSize}G` }}
+        </div>
+        <div class="flex items-start min-h-[32px]">
+          <label class="node-config-label">{{ $t('tke.label.dataDisk') }}</label>
+          <div class="flex items-start flex-col pt-[5px]">
+            <span
+              v-for="disk, i in item.cloudDataDisks" :key="i"
+              class="bcs-ellipsis flex-1 leading-[20px]">
+              {{ `${diskMap[disk.diskType]} ${disk.diskSize}G ${disk.fileSystem} ${disk.mountTarget}` }}
+            </span>
+          </div>
+        </div>
+        <div
+          :class="[
+            'flex items-center justify-center rounded-tl-lg',
+            'absolute right-0 bottom-0 min-w-[80px] h-[32px]',
+            'text-[#fff] text-[14px] font-bold bg-[#699DF4]'
+          ]">
+          x {{ item.applyNum }}
+        </div>
+      </div>
+    </bk-form-item>
+    <bk-form-item
+      :label="$t('tke.label.securityGroup.text')"
+      property="securityGroupIDs"
+      error-display-type="normal"
+      required>
+      <SecurityGroups
+        class="max-w-[600px]"
+        multiple
+        :region="region"
+        :cloud-account-i-d="cloudAccountID"
+        :cloud-i-d="cloudID"
+        v-model="instanceCommonConfig.securityGroupIDs" />
+    </bk-form-item>
+    <bcs-sideslider
+      :is-show.sync="showNodeConfig"
+      :quick-close="false"
+      :title="editIndex === -1 ? $t('tke.title.addNodeConfig') : $t('tke.title.modifyNodeConfig')"
+      :width="740">
+      <ApplyNodeConfig
+        :region="region"
+        :account-id="cloudAccountID"
+        :vpc-id="vpcID"
+        :node-role="nodeRole"
+        :instance="editInstanceItem"
+        :cloud-account-i-d="cloudAccountID"
+        :cloud-i-d="cloudID"
+        :disable-data-disk="disableDataDisk"
+        :disable-internet-access="disableInternetAccess"
+        :max-nodes="maxNodes"
+        slot="content"
+        @cancel="showNodeConfig = false"
+        @confirm="handleNodeConfigConfirm" />
+    </bcs-sideslider>
+  </div>
+</template>
+<script setup lang="ts">
+import { computed, defineProps, PropType, ref, watch } from 'vue';
+
+import ApplyNodeConfig from './apply-node-config.vue';
+import { IImageItem, IInstanceItem, IZoneItem } from '../../../types/types';
+
+import $i18n from '@/i18n/i18n-setup';
+import $store from '@/store';
+import Region from '@/views/cluster-manage/add/components/region.vue';
+import SecurityGroups from '@/views/cluster-manage/add/components/security-groups.vue';
+import Vpc from '@/views/cluster-manage/add/components/vpc.vue';
+
+const props = defineProps({
+  region: {
+    type: String,
+    default: '',
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  cloudID: {
+    type: String,
+    default: '',
+  },
+  vpcID: {
+    type: String,
+    default: '',
+  },
+  instances: {
+    type: Array as PropType<IInstanceItem[]>,
+    default: () => [],
+  },
+  level: {
+    type: String,
+    default: '',
+  },
+  nodeRole: {
+    type: String,
+    default: '',
+  },
+  showRecommendedConfig: {
+    type: Boolean,
+    default: true,
+  },
+  disableDataDisk: {
+    type: Boolean,
+    default: true,
+  },
+  disableInternetAccess: {
+    type: Boolean,
+    default: true,
+  },
+  maxNodes: {
+    type: Number,
+    default: 5,
+  },
+});
+
+const emits = defineEmits(['instance-list-change', 'level-change', 'delete-instance', 'common-config-change']);
+
+const imageID = computed(() => $store.state.cloudMetadata.imageID);
+const applyNum = computed(() => props.instances.reduce((pre, item) => {
+  pre += Number(item.applyNum) || 0;
+  return pre;
+}, 0));
+
+const diskMap = ref({
+  CLOUD_PREMIUM: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.premium'),
+  CLOUD_SSD: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.ssd'),
+  CLOUD_HSSD: $i18n.t('cluster.ca.nodePool.create.instanceTypeConfig.diskType.hssd'),
+});
+const masterConfigSchema = ref([
+  {
+    id: 'L100',
+    name: $i18n.t('tke.configRec.l100.text'),
+    desc: $i18n.t('tke.configRec.l100.desc'),
+  },
+  {
+    id: 'L500',
+    name: $i18n.t('tke.configRec.l500.text'),
+    desc: $i18n.t('tke.configRec.l500.desc'),
+  },
+  {
+    id: 'L1000',
+    name: $i18n.t('tke.configRec.l1000.text'),
+    desc: $i18n.t('tke.configRec.l1000.desc'),
+  },
+  {
+    id: '',
+    name: $i18n.t('tke.configRec.custom.text'),
+    desc: $i18n.t('tke.configRec.custom.desc'),
+  },
+]);
+const handleLevelChange = (level) => {
+  emits('level-change', level);
+};
+
+const periodList = ref([
+  ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11].map(month => ({
+    id: month,
+    name: $i18n.t('units.time.nMonths', [month]),
+  })),
+  ...[1, 2, 3].map(year => ({
+    id: year * 12,
+    name: $i18n.t('units.time.nYears', [year]),
+  })),
+]);
+const showNodeConfig = ref(false);
+
+// 获取zone name
+const zoneList = computed<IZoneItem[]>(() => $store.state.cloudMetadata.zoneList);
+const getZoneName = zone => zoneList.value.find(item => item.zone === zone)?.zoneName;
+
+// 节点公共配置
+const instanceCommonConfig = ref<Partial<IInstanceItem>>({
+  nodeRole: props.nodeRole, // MASTER_ETCD WORKER
+  instanceChargeType: '',
+  securityGroupIDs: [],
+  isSecurityService: true, // 默认true
+  isMonitorService: true, // 默认true
+  charge: {
+    period: 1,
+    renewFlag: 'NOTIFY_AND_AUTO_RENEW', // NOTIFY_AND_AUTO_RENEW, NOTIFY_AND_MANUAL_RENEW, DISABLE_NOTIFY_AND_MANUAL_RENEW
+  },
+});
+watch(
+  instanceCommonConfig,
+  () => {
+    emits('common-config-change', instanceCommonConfig.value);
+  },
+  { deep: true, immediate: true },
+);
+
+// 镜像列表
+const imageList = computed<Array<IImageItem>>(() => $store.state.cloudMetadata.osList);
+
+// 计费模式
+const chargeDesc = ref({
+  allowHTML: true,
+  content: '#chargeDesc',
+});
+const handleChargeTypeChange = (value) => {
+  if (value === 'PREPAID') {
+    instanceCommonConfig.value.charge = {
+      period: 1,
+      renewFlag: 'NOTIFY_AND_AUTO_RENEW',
+    };
+  } else if (value === 'POSTPAID_BY_HOUR') {
+    instanceCommonConfig.value.charge = null;
+  }
+};
+
+// 添加或者修改节点配置
+const editIndex = ref(-1);
+const editInstanceItem = computed<IInstanceItem|null>(() => {
+  if (editIndex.value === -1) return null;
+
+  return props.instances[editIndex.value];
+});
+const handleAddInstance = () => {
+  editIndex.value = -1;
+  showNodeConfig.value = true;
+};
+const handleModifyInstance = (index) => {
+  editIndex.value = index;
+  showNodeConfig.value = true;
+};
+// 删除节点配置
+const handleDeleteInstance = (index) => {
+  emits('delete-instance', index);
+  handleLevelChange('');// 重置level
+};
+const handleNodeConfigConfirm = async (item: IInstanceItem) => {
+  if (editIndex.value > -1) {
+    const data: IInstanceItem[] = JSON.parse(JSON.stringify(props.instances));
+    data.splice(editIndex.value, 1, item);
+    emits('instance-list-change', data);
+  } else {
+    emits('instance-list-change', [
+      ...props.instances,
+      item,
+    ]);
+  }
+  handleLevelChange('');// 重置level
+  showNodeConfig.value = false;
+};
+</script>
+<style scoped lang="postcss">
+.node-config-label {
+  display: flex;
+  justify-content: flex-end;
+  width: 90px;
+  margin-right: 4px;
+  &::after {
+    content: ':';
+    margin-left: 4px;
+  }
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/apply-node-config.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/apply-node-config.vue
new file mode 100644
index 0000000000..84ee0425c3
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/apply-node-config.vue
@@ -0,0 +1,587 @@
+<template>
+  <div class="h-[calc(100vh-60px)]" ref="nodeConfigRef">
+    <bk-form
+      class="py-[20px] px-[40px] max-h-[calc(100vh-108px)] overflow-auto"
+      form-type="vertical"
+      :model="instanceItem"
+      :rules="rules"
+      ref="formRef">
+      <bk-form-item
+        :label="$t('tke.label.zone')"
+        property="zone"
+        error-display-type="normal"
+        required>
+        <Zone
+          v-model="instanceItem.zone"
+          :region="region"
+          :cloud-account-i-d="cloudAccountID"
+          :cloud-i-d="cloudID"
+          :vpc-id="vpcId"
+          :disabled-tips="$t('tke.tips.zone')"
+          :enabled-zone-list="enabledZoneList"
+          :init-data="true" />
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('tke.label.subnet')"
+        property="subnetID"
+        error-display-type="normal"
+        required>
+        <bk-select
+          searchable
+          :clearable="false"
+          :loading="subnetLoading && !!instanceItem.zone"
+          v-model="instanceItem.subnetID">
+          <bk-option
+            v-for="net in subnets"
+            :key="net.subnetID"
+            :id="net.subnetID"
+            :name="`${net.subnetName}(${net.subnetID})`"
+            :disabled="!net.availableIPAddressCount || !!Object.keys(net.cluster || {}).length">
+            <div
+              class="flex items-center justify-between"
+              v-bk-tooltips="{
+                content: Object.keys(net.cluster || {}).length
+                  ? $t('tke.tips.subnetInUsed', [net.cluster ? net.cluster.clusterName : ''])
+                  : $t('tke.tips.noAvailableIp'),
+                disabled: net.availableIPAddressCount && !Object.keys(net.cluster || {}).length,
+                placement: 'left'
+              }">
+              <span>{{ `${net.subnetName}(${net.subnetID})` }}</span>
+              <span
+                :class="(!net.availableIPAddressCount || Object.keys(net.cluster || {}).length) ? '':'text-[#979BA5]'">
+                {{ `${$t('tke.label.availableIpNum')}: ${net.availableIPAddressCount}` }}
+              </span>
+            </div>
+          </bk-option>
+          <template slot="extension">
+            <SelectExtension
+              :link-text="$t('tke.link.subnet')"
+              :link="`https://console.cloud.tencent.com/vpc/subnet?unVpcId=${vpcId}`"
+              @refresh="handleGetSubnets" />
+          </template>
+        </bk-select>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('tke.label.instanceType')"
+        property="instanceType"
+        error-display-type="normal"
+        required>
+        <div class="flex items-center">
+          <span class="prefix">CPU</span>
+          <bcs-select v-model="cpu" searchable class="ml-[-1px] w-[140px] mr-[16px]" @change="handleValidateInstance">
+            <bcs-option v-for="item in cpuList" :key="item" :id="item" :name="item"></bcs-option>
+          </bcs-select>
+          <span class="prefix">{{ $t('generic.label.mem') }}</span>
+          <bcs-select v-model="mem" searchable class="ml-[-1px] w-[140px]" @change="handleValidateInstance">
+            <bcs-option v-for="item in memList" :key="item" :id="item" :name="item"></bcs-option>
+          </bcs-select>
+        </div>
+        <bcs-table
+          :data="instanceItem.zone && instanceItem.subnetID ? instanceList : []"
+          v-bkloading="{ isLoading: instanceLoading && instanceItem.zone }"
+          :pagination="pagination"
+          :row-class-name="instanceRowClass"
+          class="mt-[16px]"
+          @page-change="pageChange"
+          @page-limit-change="pageSizeChange"
+          @row-click="handleCheckInstanceType"
+          @filter-change="handleFilterChange"
+          @sort-change="handleSortChange">
+          <bcs-table-column
+            :label="$t('generic.ipSelector.label.serverModel')"
+            :filters="nodeTypeFilters"
+            :key="nodeTypeFilters.length"
+            column-key="typeName"
+            filter-multiple
+            prop="typeName">
+            <template #default="{ row }">
+              <span
+                v-bk-tooltips="{
+                  disabled: row.status !== 'SOLD_OUT',
+                  content: $t('cluster.ca.nodePool.create.instanceTypeConfig.status.soldOut')
+                }">
+                <bcs-radio
+                  class="flex items-center node-config-radio"
+                  :value="instanceItem.instanceType === row.nodeType"
+                  :disabled="row.status === 'SOLD_OUT'">
+                  <span class="bcs-ellipsis">{{row.typeName}}</span>
+                </bcs-radio>
+              </span>
+            </template>
+          </bcs-table-column>
+          <bcs-table-column
+            :label="$t('generic.label.specifications')"
+            min-width="90"
+            show-overflow-tooltip
+            prop="nodeType">
+          </bcs-table-column>
+          <bcs-table-column label="CPU" prop="cpu" width="90" align="right" sortable>
+            <template #default="{ row }">
+              <span>{{ `${row.cpu}${$t('units.suffix.cores')}` }}</span>
+            </template>
+          </bcs-table-column>
+          <bcs-table-column :label="$t('generic.label.mem')" prop="memory" width="80" align="right" sortable>
+            <template #default="{ row }">
+              <span>{{ row.memory }}G</span>
+            </template>
+          </bcs-table-column>
+          <bcs-table-column
+            :label="$t('cluster.ca.nodePool.create.instanceTypeConfig.label.configurationFee.text')"
+            prop="unitPrice"
+            sortable>
+            <template #default="{ row }">
+              <span>
+                {{ $t('cluster.ca.nodePool.create.instanceTypeConfig.label.configurationFee.unit',
+                      { price: row.unitPrice })
+                }}
+              </span>
+            </template>
+          </bcs-table-column>
+        </bcs-table>
+        <p
+          class="bcs-form-error-tip text-[#ea3636] text-[12px] h-[20px] leading-[20px] mt-[4px]"
+          v-if="!instanceItem.instanceType && !firstTrigger">{{ $t('generic.validate.required') }}</p>
+      </bk-form-item>
+      <!-- 系统盘 -->
+      <SystemDisk
+        class="mt-[24px]"
+        :value="instanceItem.systemDisk"
+        @change="(v) => instanceItem.systemDisk = v" />
+      <!-- 数据盘 -->
+      <bk-form-item
+        :label-width="0.1"
+        property="cloudDataDisks"
+        error-display-type="normal">
+        <DataDisk
+          class="mt-[20px]"
+          :value="instanceItem.cloudDataDisks"
+          :disabled="disableDataDisk"
+          @change="(v) => instanceItem.cloudDataDisks = v" />
+      </bk-form-item>
+      <!-- 带宽包 -->
+      <bk-form-item
+        :label-width="0.1"
+        property="internetAccess"
+        error-display-type="normal"
+        v-if="!disableInternetAccess">
+        <InternetAccess
+          :region="region"
+          :cloud-account-i-d="cloudAccountID"
+          :cloud-i-d="cloudID"
+          :value="instanceItem.internetAccess"
+          class="mb-[20px]"
+          @change="(v) => instanceItem.internetAccess = v"
+          @account-type-change="(v) => accountType = v" />
+      </bk-form-item>
+
+      <bk-form-item :label="$t('tke.label.count')">
+        <bcs-input
+          type="number"
+          class="max-w-[120px]"
+          :min="1"
+          :max="maxNodes"
+          v-model="instanceItem.applyNum">
+        </bcs-input>
+      </bk-form-item>
+      <p class="text-[#979BA5] leading-[16px] mt-[8px] text-[12px]">
+        {{ $t('tke.tips.maxNodeNum', [maxNodes]) }}
+      </p>
+    </bk-form>
+    <div class="flex items-center px-[40px] absolute bottom-0 left-0 bg-[#FAFBFD] w-full h-[48px] bcs-border-top">
+      <bcs-button theme="primary" class="min-w-[88px]" @click="handleConfirm">
+        {{ isEdit ? $t('generic.button.confirm') : $t('generic.button.add') }}
+      </bcs-button>
+      <bcs-button class="min-w-[88px]" @click="handleCancel">{{ $t('generic.button.cancel') }}</bcs-button>
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import { merge } from 'lodash';
+import { computed, inject, PropType, ref, watch } from 'vue';
+
+import { ClusterDataInjectKey, IInstanceItem, IInstanceType, ISubnet } from '../../../types/types';
+
+import { cloudInstanceTypes, cloudSubnets } from '@/api/modules/cluster-manager';
+import SelectExtension from '@/components/select-extension.vue';
+import usePage from '@/composables/use-page';
+import $i18n from '@/i18n/i18n-setup';
+import DataDisk from '@/views/cluster-manage/add/components/data-disk.vue';
+import InternetAccess from '@/views/cluster-manage/add/components/internet-access.vue';
+import SystemDisk from '@/views/cluster-manage/add/components/system-disk.vue';
+import Zone from '@/views/cluster-manage/add/components/zone.vue';
+
+const cloudID = 'tencentPublicCloud';
+
+const props = defineProps({
+  region: {
+    type: String,
+    default: '',
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  accountId: {
+    type: String,
+    default: '',
+  },
+  vpcId: {
+    type: String,
+    default: '',
+  },
+  instance: {
+    type: Object as PropType<IInstanceItem|null>,
+    default: () => ({}),
+  },
+  nodeRole: {
+    type: String,
+    default: '',
+  },
+  disableDataDisk: {
+    type: Boolean,
+    default: true,
+  },
+  disableInternetAccess: {
+    type: Boolean,
+    default: true,
+  },
+  maxNodes: {
+    type: Number,
+    default: 5,
+  },
+});
+const isEdit = computed(() => !!props.instance && !!Object.keys(props.instance).length);
+const emits = defineEmits(['cancel', 'confirm']);
+
+const clusterData = inject(ClusterDataInjectKey);
+const enabledZoneList = computed(() => {
+  if (!clusterData?.value) return [];
+
+  return clusterData.value?.clusterAdvanceSettings?.networkType === 'VPC-CNI'
+    ? clusterData.value?.networkSettings?.subnetSource?.new?.map(item => item.zone) || []
+    : [];
+});
+
+const initData = ref({
+  subnetID: '',
+  applyNum: 1,
+  zone: '',
+  instanceType: '',
+  systemDisk: {
+    diskType: 'CLOUD_PREMIUM',
+    diskSize: '50',
+  },
+  cloudDataDisks: [
+    {
+      diskType: 'CLOUD_PREMIUM', // 类型
+      diskSize: '100', // 大小
+      fileSystem: 'ext4', // 文件系统
+      autoFormatAndMount: true, // 是否格式化
+      mountTarget: '/data', // 挂载路径
+    },
+  ],
+  internetAccess: {
+    internetChargeType: 'TRAFFIC_POSTPAID_BY_HOUR',
+    internetMaxBandwidth: '0',
+    publicIPAssigned: false,
+    bandwidthPackageId: '',
+  },
+});
+const instanceItem = ref(initData.value);
+const accountType = ref<'STANDARD'|'LEGACY'>();
+const rules = ref({
+  zone: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  subnetID: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  cloudDataDisks: [
+    {
+      trigger: 'custom',
+      message: '',
+      validator() {
+        let preMountTarget = '';
+        const repeatMountTarget = instanceItem.value.cloudDataDisks.some((item) => {
+          if (preMountTarget === item.mountTarget) return true;
+          preMountTarget = item.mountTarget;
+          return false;
+        });
+        return !repeatMountTarget;
+      },
+    },
+  ],
+  internetAccess: [
+    {
+      trigger: 'custom',
+      message: $i18n.t('ca.tips.requiredBandwidthPackage'),
+      validator() {
+        if (instanceItem.value.internetAccess.publicIPAssigned
+        && instanceItem.value.internetAccess.internetChargeType === 'BANDWIDTH_PACKAGE'
+        && accountType.value === 'STANDARD') {
+          return !!instanceItem.value.internetAccess.bandwidthPackageId;
+        }
+        return true;
+      },
+    },
+  ],
+});
+
+// 子网
+const subnets = ref<Array<ISubnet>>([]);
+const subnetLoading = ref(false);
+const handleGetSubnets = async () => {
+  if (!props.accountId || !props.region || !props.vpcId || !instanceItem.value.zone) return;
+  subnetLoading.value = true;
+  subnets.value = await cloudSubnets({
+    $cloudId: cloudID,
+    region: props.region,
+    accountID: props.accountId,
+    vpcID: props.vpcId,
+    zone: instanceItem.value.zone,
+    injectCluster: true,
+  }).catch(() => []);
+  subnetLoading.value = false;
+};
+
+// 机型
+const instanceTypesList = ref<Array<IInstanceType>>([]);
+const instanceTypesListByZone = computed<IInstanceType[]>(() => instanceTypesList.value
+  .filter(item => !instanceItem.value.zone || item.zones?.includes(instanceItem.value.zone)));
+const cpu = ref();
+const cpuList = computed(() => instanceTypesListByZone.value.reduce<number[]>((pre, item) => {
+  if (pre.find(cpu => cpu === item.cpu)) return pre;
+
+  pre.push(item.cpu);
+  return pre;
+}, []).sort((a, b) => a - b));
+const mem = ref();
+const memList = computed(() => instanceTypesListByZone.value.reduce<number[]>((pre, item) => {
+  if (pre.find(mem => mem === item.memory)) return pre;
+
+  pre.push(item.memory);
+  return pre;
+}, []).sort((a, b) => a - b));
+
+const filters = ref<Record<string, string[]>>({});
+const sortData = ref({
+  prop: '',
+  order: '',
+});
+const filterInstanceList = computed(() => instanceTypesListByZone.value
+  .filter(item => (!cpu.value || item.cpu === cpu.value)
+     && (!mem.value || item.memory === mem.value))
+  .sort((a, b) => {
+    // 排序
+    if (sortData.value.prop === 'cpu') {
+      return sortData.value.order === 'ascending' ? a.cpu - b.cpu : b.cpu - a.cpu;
+    }
+    if (sortData.value.prop === 'memory') {
+      return sortData.value.order === 'ascending' ? a.memory - b.memory : b.memory - a.memory;
+    }
+    if (sortData.value.prop === 'unitPrice') {
+      return sortData.value.order === 'ascending' ? a.unitPrice - b.unitPrice : b.unitPrice - a.unitPrice;
+    }
+    return 0;
+  }));
+const nodeTypeFilters = computed(() => filterInstanceList.value
+  .reduce<Array<{text: string, value: string}>>((pre, item) => {
+  const exist = pre.find(data => data.value === item.typeName);
+  if (!exist) {
+    pre.push({
+      text: item.typeName,
+      value: item.typeName,
+    });
+  }
+  return pre;
+}, []));
+
+const handleFilterChange = (data) => {
+  pageChange(1);
+  filters.value = data;
+};
+const handleSortChange = ({ prop, order  }) => {
+  sortData.value = {
+    prop,
+    order,
+  };
+};
+
+// 过滤机型
+const filterTableData = computed(() => filterInstanceList.value.filter(item => Object.keys(filters.value)
+  .every(key => !filters.value[key]?.length || filters.value[key]?.includes(item[key]))));
+
+const {
+  pagination,
+  curPageData: instanceList,
+  pageChange,
+  pageSizeChange,
+} = usePage<IInstanceType>(filterTableData);
+
+
+const instanceLoading = ref(false);
+const handleGetInstanceType = async () => {
+  if (!props.accountId || !props.region) return;
+  instanceLoading.value = true;
+  instanceTypesList.value = await cloudInstanceTypes({
+    $cloudId: cloudID,
+    region: props.region,
+    accountID: props.accountId,
+  }).catch(() => []);
+  instanceLoading.value = false;
+};
+const instanceRowClass = ({ row }) => {
+  // SELL 表示售卖，SOLD_OUT 表示售罄
+  if (row.status === 'SELL') {
+    return 'table-row-enable';
+  }
+  return 'table-row-disabled';
+};
+const handleCheckInstanceType = (row) => {
+  if (row.status === 'SOLD_OUT') return;
+  instanceItem.value.instanceType = row.nodeType;
+};
+
+// 取消
+const handleCancel = () => {
+  emits('cancel');
+};
+// 校验
+const firstTrigger = ref(true);
+const formRef = ref();
+const validate = async () => {
+  firstTrigger.value = false;
+  const result = await formRef.value?.validate().catch(() => false);
+  const validateSystemDiskSize = Number(instanceItem.value.systemDisk.diskSize) % 10 === 0;
+  const validateDataDiskSize = instanceItem.value.cloudDataDisks.every(item => Number(item.diskSize) % 10 === 0);
+  return result && !!instanceItem.value.instanceType && validateSystemDiskSize && validateDataDiskSize;
+};
+// 确定
+const nodeConfigRef = ref();
+const handleConfirm = async () => {
+  const instance = instanceTypesList.value.find(item => item.nodeType === instanceItem.value.instanceType);
+  const result = await validate();
+  if (result) {
+    emits('confirm', {
+      ...instanceItem.value,
+      applyNum: Number(instanceItem.value.applyNum), // 类型转换
+      CPU: instance?.cpu || props.instance?.CPU,
+      Mem: instance?.memory || props.instance?.Mem,
+      systemDisk: {
+        diskType: instanceItem.value.systemDisk.diskType,
+        diskSize: String(instanceItem.value.systemDisk.diskSize), // 类型转换
+      },
+      cloudDataDisks: instanceItem.value.cloudDataDisks.map(item => ({
+        ...item,
+        diskSize: String(item.diskSize), // 类型转换
+      })),
+    });
+  } else {
+    // 自动滚动到第一个错误的位置
+    const errDom = nodeConfigRef.value?.querySelectorAll('.form-error-tip');
+    const bcsErrDom = nodeConfigRef.value?.querySelectorAll('.bcs-form-error-tip');
+    const firstErrDom = errDom[0] || bcsErrDom[0];
+    firstErrDom?.scrollIntoView({
+      block: 'center',
+      behavior: 'smooth',
+    });
+  }
+};
+
+// 校验机型是否在当前页中
+const handleValidateInstance = () => {
+  setTimeout(() => {
+    const exitInstance = filterInstanceList.value.find(item => item.nodeType === instanceItem.value.instanceType);
+    if (!exitInstance) {
+      instanceItem.value.instanceType = '';
+    }
+  });
+};
+
+watch(
+  [
+    () => cpu.value,
+    () => mem.value,
+  ],
+  () => {
+    pageChange(1);
+  },
+);
+watch(
+  [
+    () => props.accountId,
+    () => props.region,
+    () => props.vpcId,
+  ],
+  () => {
+    handleGetSubnets();
+  },
+  { immediate: true },
+);
+watch(
+  [
+    () => props.accountId,
+    () => props.region,
+  ],
+  () => {
+    handleGetInstanceType();
+  },
+  { immediate: true },
+);
+watch(
+  () => props.instance,
+  () => {
+    instanceItem.value = merge({}, initData.value, props.instance);
+    cpu.value = props.instance?.CPU;
+    mem.value = props.instance?.Mem;
+    handleGetSubnets();
+  },
+  { deep: true, immediate: true },
+);
+watch(() => instanceItem.value.zone, () => {
+  instanceItem.value.subnetID = '';
+  instanceItem.value.instanceType = '';
+  handleGetSubnets();
+});
+</script>
+<style lang="postcss" scoped>
+.prefix {
+  display: inline-block;
+  height: 32px;
+  line-height: 32px;
+  background: #F0F1F5;
+  border: 1px solid #C4C6CC;
+  border-radius: 2px 0 0 2px;
+  padding: 0 8px;
+  font-size: 12px;
+  &.disabled {
+    border-color: #dcdee5;
+  }
+}
+.company {
+  font-size: 12px;
+  display: inline-block;
+  min-width: 30px;
+  padding: 0 4px 0 4px;
+  height: 32px;
+  border: 1px solid #C4C6CC;
+  text-align: center;
+  border-left: none;
+  background-color: #fafbfd;
+  &.disabled {
+    border-color: #dcdee5;
+  }
+}
+
+>>> .node-config-radio .bk-radio-text {
+  flex: 1;
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/basic.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/basic.vue
new file mode 100644
index 0000000000..19cd686296
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/basic.vue
@@ -0,0 +1,418 @@
+<template>
+  <bk-form
+    :model="basicInfo"
+    :rules="basicInfoRules"
+    ref="formRef"
+    class="k8s-form grid grid-cols-2 grid-rows-1 gap-[16px]">
+    <DescList size="middle" :title="$t('cluster.create.label.clusterInfo')">
+      <bk-form-item :label="$t('cluster.create.label.kubernetesProvider')">
+        {{ $t('provider.weiruanyun') }}
+      </bk-form-item>
+      <bk-form-item :label="$t('tke.label.account')" property="cloudAccountID" error-display-type="normal" required>
+        <bk-select :loading="accountLoading" v-model="basicInfo.cloudAccountID" searchable :clearable="false">
+          <bk-option
+            v-for="item in accountList"
+            :key="item.account.accountID"
+            :id="item.account.accountID"
+            :name="item.account.accountName">
+          </bk-option>
+          <template slot="extension">
+            <SelectExtension
+              :link-text="$t('tke.link.cloudToken')"
+              @link="gotoTencentToken"
+              @refresh="handleGetAccounts" />
+          </template>
+        </bk-select>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('importAzureCloud.label.resourceGroups')"
+        property="extraInfo.cloudProjectId"
+        error-display-type="normal"
+        required>
+        <bk-select
+          searchable
+          :clearable="false"
+          :loading="projectLoading"
+          v-model="basicInfo.extraInfo.cloudProjectId">
+          <bk-option
+            v-for="item in projectList"
+            :key="item.projectID"
+            :id="item.projectID"
+            :name="item.projectID !== '0' ? `${item.projectName}(${item.projectID})` : item.projectName">
+          </bk-option>
+          <template slot="extension">
+            <SelectExtension
+              :link-text="$t('tke.link.cloudProject')"
+              @link="gotoTencentProject"
+              @refresh="handleGetProjects" />
+          </template>
+        </bk-select>
+      </bk-form-item>
+      <bk-form-item :label="$t('cluster.labels.name')" property="clusterName" error-display-type="normal" required>
+        <bk-input
+          :maxlength="64"
+          :placeholder="$t('cluster.create.validate.name')"
+          v-model.trim="basicInfo.clusterName">
+        </bk-input>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.label.clusterVersion')"
+        property="clusterBasicSettings.version"
+        error-display-type="normal"
+        required>
+        <bk-select
+          :loading="templateLoading"
+          v-model="basicInfo.clusterBasicSettings.version"
+          searchable
+          :clearable="false"
+          class="max-w-[calc(50%-46px)]">
+          <bk-option v-for="item in versionList" :key="item" :id="item" :name="item"></bk-option>
+        </bk-select>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('k8s.label')"
+        property="labels"
+        error-display-type="normal">
+        <KeyValue
+          v-model="basicInfo.labels"
+          :key-rules="[
+            {
+              message: $t('generic.validate.label'),
+              validator: LABEL_KEY_REGEXP,
+            }
+          ]"
+          :value-rules="[
+            {
+              message: $t('generic.validate.label'),
+              validator: LABEL_KEY_REGEXP,
+            }
+          ]" />
+      </bk-form-item>
+      <bk-form-item :label="$t('cluster.create.label.desc')">
+        <bk-input maxlength="100" v-model="basicInfo.description" type="textarea"></bk-input>
+      </bk-form-item>
+    </DescList>
+    <div>
+      <DescList size="middle" :title="$t('cluster.labels.env')">
+        <bk-form-item :label="$t('cluster.create.label.region')" property="region" error-display-type="normal" required>
+          <Region
+            :cloud-account-i-d="basicInfo.cloudAccountID"
+            :cloud-i-d="cloudID"
+            init-data
+            v-model="basicInfo.region" />
+        </bk-form-item>
+        <bk-form-item
+          :label="$t('tke.label.nodemanArea')"
+          property="clusterBasicSettings.area.bkCloudID"
+          error-display-type="normal"
+          required>
+          <bk-select
+            searchable
+            :clearable="false"
+            :loading="nodemanCloudLoading"
+            v-model="basicInfo.clusterBasicSettings.area.bkCloudID">
+            <bk-option
+              v-for="item in nodemanCloudList"
+              :key="item.bk_cloud_id"
+              :id="item.bk_cloud_id"
+              :name="item.bk_cloud_name">
+            </bk-option>
+            <template slot="extension">
+              <SelectExtension
+                :link-text="$t('tke.link.nodeman')"
+                :link="`${PROJECT_CONFIG.nodemanHost}/#/cloud-manager`"
+                @refresh="handleGetNodeManCloud" />
+            </template>
+          </bk-select>
+        </bk-form-item>
+        <bk-form-item :label="$t('cluster.labels.env')" property="environment" error-display-type="normal" required>
+          <bk-radio-group v-model="basicInfo.environment">
+            <bk-radio value="debug">
+              {{ $t('cluster.env.debug') }}
+            </bk-radio>
+            <bk-radio value="prod">
+              {{ $t('cluster.env.prod') }}
+            </bk-radio>
+          </bk-radio-group>
+        </bk-form-item>
+      </DescList>
+      <DescList class="mt-[24px]" size="middle" :title="$t('cluster.title.clusterConfig')">
+        <bk-form-item :label="$t('cluster.create.azure.chargingModel')">
+        </bk-form-item>
+        <bk-form-item :label="$t('k8s.updateStrategy.text')">
+        </bk-form-item>
+      </DescList>
+    </div>
+    <div class="flex items-center h-[48px] bg-[#FAFBFD] px-[24px] fixed bottom-0 left-0 w-full bcs-border-top">
+      <bk-button theme="primary" class="ml10" @click="nextStep">{{ $t('generic.button.next') }}</bk-button>
+      <bk-button class="ml10" @click="handleCancel">{{ $t('generic.button.cancel') }}</bk-button>
+    </div>
+  </bk-form>
+</template>
+<script setup lang="ts">
+import { computed, onMounted, PropType, ref, watch } from 'vue';
+
+import { ICloudProject, INodeManCloud } from '../../../types/types';
+
+import {
+  cloudDetail,
+  cloudProjects,
+  cloudVersionModules,
+  nodemanCloud,
+} from '@/api/modules/cluster-manager';
+import { LABEL_KEY_REGEXP } from '@/common/constant';
+import DescList from '@/components/desc-list.vue';
+import SelectExtension from '@/components/select-extension.vue';
+import $i18n from '@/i18n/i18n-setup';
+import $router from '@/router';
+import Region from '@/views/cluster-manage/add/components/region.vue';
+import KeyValue from '@/views/cluster-manage/components/key-value.vue';
+import useCloud, { ICloudAccount } from '@/views/cluster-manage/use-cloud';;
+
+const props = defineProps({
+  cloudID: {
+    type: String as PropType<CloudID>,
+    default: '',
+  },
+});
+
+const emits = defineEmits(['next', 'cancel']);
+
+// 基本信息
+const basicInfo = ref({
+  cloudAccountID: '', // 云凭证
+  clusterName: '',
+  environment: '',
+  provider: '',
+  clusterBasicSettings: {
+    version: '',
+    OS: '',
+    area: {  // 云区域
+      bkCloudID: 0,
+    },
+  },
+  description: '',
+  region: '',
+  labels: {},
+  clusterAdvanceSettings: {
+    containerRuntime: '', // 运行时
+    runtimeVersion: '', // 运行时版本
+  },
+  extraInfo: {
+    cloudProjectId: '0',
+  },
+});
+watch(() => basicInfo.value.cloudAccountID, () => {
+  basicInfo.value.extraInfo.cloudProjectId = '0';
+  basicInfo.value.region = '';
+});
+watch(() => basicInfo.value.region, () => {
+  basicInfo.value.clusterBasicSettings.OS = '';
+});
+const basicInfoRules = ref({
+  cloudAccountID: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'extraInfo.cloudProjectId': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  clusterName: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'clusterBasicSettings.version': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  region: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'clusterBasicSettings.area.bkCloudID': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  environment: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'clusterBasicSettings.OS': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'clusterAdvanceSettings.containerRuntime': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'clusterAdvanceSettings.runtimeVersion': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  labels: [
+    {
+      message: $i18n.t('generic.validate.label'),
+      trigger: 'custom',
+      validator: () => {
+        const { labels } = basicInfo.value;
+        const rule = new RegExp(LABEL_KEY_REGEXP);
+        return Object.keys(labels).every(key => rule.test(key) && rule.test(labels[key]));
+      },
+    },
+  ],
+});
+
+// 集群模板
+const templateDetail = ref<Partial<ICloudTemplateDetail>>({});
+const templateLoading = ref(false);
+const handleGetTemplateList = async () => {
+  templateLoading.value = true;
+  templateDetail.value = await cloudDetail({
+    $cloudId: props.cloudID,
+  }).catch(() => []);
+  basicInfo.value.provider = templateDetail.value?.cloudID || '';
+  // 初始化默认集群版本
+  basicInfo.value.clusterBasicSettings.version = templateDetail.value?.clusterManagement?.availableVersion?.[0] || '';
+  templateLoading.value = false;
+};
+
+// 云凭证
+const { cloudAccounts } = useCloud();
+const accountLoading = ref(false);
+const accountList = ref<ICloudAccount[]>([]);
+const handleGetAccounts = async () => {
+  accountLoading.value = true;
+  const { data } = await cloudAccounts(props.cloudID);
+  accountList.value = data;
+  // 初始化第一个云凭证
+  basicInfo.value.cloudAccountID = accountList.value?.[0]?.account?.accountID || '';
+  accountLoading.value = false;
+};
+const gotoTencentToken = () => {
+  const { href } = $router.resolve({ name: 'tencentPublicCloud' });
+  window.open(href);
+};
+
+// 云项目
+const projectLoading = ref(false);
+const projectList = ref<Array<ICloudProject>>([]);
+const handleGetProjects = async () => {
+  if (!basicInfo.value.cloudAccountID) return;
+
+  projectLoading.value = true;
+  projectList.value = await cloudProjects({
+    accountID: basicInfo.value.cloudAccountID,
+    $cloudId: props.cloudID,
+  }).catch(() => []);
+  projectList.value.unshift({
+    projectID: '0',
+    projectName: $i18n.t('tke.label.defaultProject'),
+  });
+  projectLoading.value = false;
+};
+
+// 版本列表
+const versionList = computed(() => templateDetail.value?.clusterManagement?.availableVersion || []);
+
+
+// 管控区域
+const nodemanCloudList = ref<Array<INodeManCloud>>([]);
+const nodemanCloudLoading = ref(false);
+const handleGetNodeManCloud = async () => {
+  nodemanCloudLoading.value = true;
+  nodemanCloudList.value = await nodemanCloud().catch(() => []);
+  nodemanCloudLoading.value = false;
+};
+
+const moduleLoading = ref(false);
+const runtimeModuleParams = ref<IRuntimeModuleParams[]>([]);
+const getRuntimeModuleParams = async () => {
+  if (!basicInfo.value.clusterBasicSettings.version) return;
+  moduleLoading.value = true;
+  const data = await cloudVersionModules({
+    $cloudId: props.cloudID,
+    $version: basicInfo.value.clusterBasicSettings.version,
+    $module: 'runtime',
+  });
+  runtimeModuleParams.value = data.filter(item => item.enable);
+  // 初始化默认运行时
+  basicInfo.value.clusterAdvanceSettings.containerRuntime = runtimeModuleParams.value?.[0]?.flagName || '';
+  basicInfo.value.clusterAdvanceSettings.runtimeVersion = runtimeModuleParams.value?.[0]?.defaultValue || '';
+  moduleLoading.value = false;
+};
+const gotoTencentProject = () => {
+  window.open('https://console.cloud.tencent.com/project');
+};
+
+watch(() => basicInfo.value.cloudAccountID, () => {
+  handleGetProjects();
+});
+
+// 运行时组件参数
+watch(() => basicInfo.value.clusterBasicSettings.version, () => {
+  getRuntimeModuleParams();
+});
+
+onMounted(() => {
+  handleGetTemplateList();
+  handleGetAccounts();
+  handleGetNodeManCloud();
+});
+
+// 校验
+const formRef = ref();
+const validate = async () => {
+  const result = await formRef.value?.validate().catch(() => false);
+  return result;
+};
+
+// 下一步
+const nextStep = async () => {
+  const result = await validate();
+  result && emits('next', basicInfo.value);
+};
+// 取消
+const handleCancel = () => {
+  emits('cancel');
+};
+
+defineExpose({
+  validate,
+});
+</script>
+<style scoped lang="postcss">
+/deep/ .bk-option-group-name {
+  border-bottom: 0 !important;
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/index.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/index.vue
new file mode 100644
index 0000000000..acc0906832
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/index.vue
@@ -0,0 +1,295 @@
+<!-- eslint-disable max-len -->
+<template>
+  <BcsContent
+    :padding="0"
+    class="add-azure-cluster"
+    :title="$t('cluster.button.addCluster')"
+    :desc="$t('generic.title.createPublicCluster')">
+    <div class="h-full pt-[8px] bg-[#f0f1f5]">
+      <bcs-tab
+        :label-height="42"
+        :validate-active="false"
+        :active.sync="activeTabName"
+        type="card-tab"
+        class="h-full">
+        <!-- 基本信息 -->
+        <bcs-tab-panel :name="steps[0].name">
+          <template #label>
+            <StepTabLabel
+              :title="$t('generic.title.basicInfo1')"
+              :step-num="1"
+              :active="activeTabName === steps[0].name"
+              :is-error="steps[0].isErr" />
+          </template>
+          <BasicInfo
+            :cloud-i-d="cloudID"
+            ref="basicRef"
+            @next="nextStep"
+            @cancel="handleCancel" />
+        </bcs-tab-panel>
+        <!-- 网络配置 -->
+        <bcs-tab-panel :name="steps[1].name" :disabled="steps[1].disabled">
+          <template #label>
+            <StepTabLabel
+              :title="$t('cluster.detail.title.network')"
+              :step-num="2"
+              :active="activeTabName === steps[1].name"
+              :disabled="steps[1].disabled"
+              :is-error="steps[1].isErr" />
+          </template>
+          <Network
+            :region="clusterData.region"
+            :cloud-account-i-d="clusterData.cloudAccountID"
+            :cloud-i-d="cloudID"
+            ref="netRef"
+            @pre="preStep"
+            @next="nextStep"
+            @cancel="handleCancel" />
+        </bcs-tab-panel>
+        <!-- Master配置 -->
+        <bcs-tab-panel :name="steps[2].name" :disabled="steps[2].disabled">
+          <template #label>
+            <StepTabLabel
+              :title="$t('cluster.detail.title.controlConfig')"
+              :step-num="3"
+              :active="activeTabName === steps[2].name"
+              :disabled="steps[2].disabled"
+              :is-error="steps[2].isErr" />
+          </template>
+          <Master
+            :region="clusterData.region"
+            :cloud-account-i-d="clusterData.cloudAccountID"
+            :cloud-i-d="cloudID"
+            :provider="clusterData.provider"
+            :vpc-i-d="clusterData.vpcID"
+            :nodes="clusterData.nodes"
+            ref="masterRef"
+            @pre="preStep"
+            @next="nextStep"
+            @cancel="handleCancel"
+            @instances-change="handleMasterInstanceChange" />
+        </bcs-tab-panel>
+        <!-- 添加节点 -->
+        <bcs-tab-panel :name="steps[3].name" :disabled="steps[3].disabled">
+          <template #label>
+            <StepTabLabel
+              :title="$t('cluster.nodeList.create.text')"
+              :step-num="4"
+              :active="activeTabName === steps[3].name"
+              :disabled="steps[3].disabled"
+              :is-error="steps[3].isErr" />
+          </template>
+          <Nodes
+            :region="clusterData.region"
+            :cloud-account-i-d="clusterData.cloudAccountID"
+            :cloud-i-d="cloudID"
+            :environment="clusterData.environment"
+            :provider="clusterData.provider"
+            :vpc-i-d="clusterData.vpcID"
+            :master="clusterData.master"
+            :master-login="clusterData.nodeSettings ? clusterData.nodeSettings.masterLogin : undefined"
+            :manage-type="clusterData.manageType"
+            :auto-generate-master-nodes="clusterData.autoGenerateMasterNodes"
+            ref="nodesRef"
+            @pre="preStep"
+            @next="nextStep"
+            @cancel="handleCancel"
+            @confirm="handleShowConfirmDialog"
+            @instances-change="handleNodesInstanceChange" />
+        </bcs-tab-panel>
+      </bcs-tab>
+    </div>
+  </BcsContent>
+</template>
+<script lang="ts" setup>
+import { merge } from 'lodash';
+import { computed, provide, ref, watch } from 'vue';
+
+import { ClusterDataInjectKey, DeepPartial, IClusterData, IInstanceItem  } from '../../../types/types';
+
+import BasicInfo from './basic.vue';
+import Master from './master.vue';
+import Network from './network.vue';
+import Nodes from './nodes.vue';
+
+import { createCluster } from '@/api/modules/cluster-manager';
+import $bkMessage from '@/common/bkmagic';
+import $bkInfo from '@/components/bk-magic-2.0/bk-info';
+import BcsContent from '@/components/layout/Content.vue';
+import { useProject } from '@/composables/use-app';
+import $i18n from '@/i18n/i18n-setup';
+import $router from '@/router';
+import $store from '@/store';
+import StepTabLabel from '@/views/cluster-manage/add/components/step-tab-label.vue';
+
+const cloudID: CloudID = 'tencentPublicCloud';
+
+const steps = ref([
+  { name: 'basicInfo', disabled: false, isErr: false },
+  { name: 'network',  disabled: false, isErr: false },
+  { name: 'master',  disabled: false, isErr: false },
+  { name: 'nodes', disabled: false, isErr: false },
+]);
+
+const activeTabName = ref<typeof steps.value[number]['name']>('basicInfo');
+
+const clusterData = ref<DeepPartial<IClusterData>>({});
+
+provide(ClusterDataInjectKey, clusterData);
+
+// tab切换
+watch(activeTabName, () => {
+  const tabItem = steps.value.find(item => item.name === activeTabName.value);
+  if (tabItem) {
+    tabItem.isErr = false;
+  }
+});
+
+// tab切换
+watch(activeTabName, () => {
+  const tabItem = steps.value.find(item => item.name === activeTabName.value);
+  if (tabItem) {
+    tabItem.isErr = false;
+  }
+});
+
+// 机型
+const masterInstances = ref<IInstanceItem[]>([]);
+const handleMasterInstanceChange = (data) => {
+  masterInstances.value = data;
+};
+const nodeInstances = ref<IInstanceItem[]>([]);
+const handleNodesInstanceChange = (data) => {
+  nodeInstances.value = data;
+};
+// 上一步
+const preStep = async () => {
+  const index = steps.value.findIndex(step => activeTabName.value === step.name);
+  if (index > -1 && index - 1 >= 0) {
+    activeTabName.value = steps.value[index - 1]?.name;
+  }
+};
+// 下一步
+const nextStep = async (data = {}) => {
+  clusterData.value = merge({}, clusterData.value, data);
+  const index = steps.value.findIndex(step => activeTabName.value === step.name);
+  if (index > -1 && index + 1 < steps.value.length) {
+    steps.value[index + 1].disabled = false;
+    activeTabName.value = steps.value[index + 1]?.name;
+  }
+};
+const handleCancel = () => {
+  $router.back();
+};
+// 校验表单
+const basicRef = ref();
+const netRef = ref();
+const masterRef = ref();
+const nodesRef = ref();
+const validate = async () => {
+  const list = [
+    basicRef.value.validate().then((result) => {
+      steps.value[0].isErr = !result;
+      return result;
+    }),
+    netRef.value.validate().then((result) => {
+      steps.value[1].isErr = !result;
+      return result;
+    }),
+    masterRef.value.validate().then((result) => {
+      steps.value[2].isErr = !result;
+      return result;
+    }),
+    nodesRef.value.validate().then((result) => {
+      steps.value[3].isErr = !result;
+      return result;
+    }),
+  ];
+  const data = await Promise.all(list);
+  return data.every(result => !!result);
+};
+// 创建集群
+const handleShowConfirmDialog = async () => {
+  const result = await validate();
+  if (!result) return;
+
+  $bkInfo({
+    type: 'warning',
+    clsName: 'custom-info-confirm',
+    title: $i18n.t('cluster.create.button.confirmCreateCluster.text'),
+    defaultInfo: true,
+    confirmFn: async () => {
+      await handleCreateCluster();
+    },
+  });
+};
+const { curProject } = useProject();
+const user = computed(() => $store.state.user);
+const handleCreateCluster = async () => {
+  const params = merge(
+    {
+      projectID: curProject.value.projectID,
+      businessID: String(curProject.value.businessID),
+      engineType: 'k8s',
+      isExclusive: true,
+      clusterType: 'single',
+      creator: user.value.username,
+    },
+    {
+      instances: [
+        ...masterInstances.value,
+        ...nodeInstances.value,
+      ],
+    },
+    clusterData.value,
+  );
+  console.log(params);
+  const result = await createCluster(params).catch(() => false);
+  if (result) {
+    $bkMessage({
+      theme: 'success',
+      message: $i18n.t('generic.msg.success.deliveryTask'),
+    });
+    $router.push({
+      name: 'clusterMain',
+      params: {
+        highlightClusterId: result?.clusterID,
+      },
+    });
+  }
+};
+
+</script>
+<style lang="postcss" scoped>
+>>> .bk-tab-header {
+  padding: 0 8px;
+}
+>>> .bk-tab-section {
+  overflow: auto;
+  height: calc(100% - 80px);
+}
+
+>>> .k8s-form .bk-form-content {
+  max-width: 600px;
+  padding-right: 24px;
+}
+>>> .prefix {
+  display: inline-block;
+  height: 32px;
+  line-height: 32px;
+  background: #F0F1F5;
+  border: 1px solid #C4C6CC;
+  border-radius: 2px 0 0 2px;
+  padding: 0 8px;
+  font-size: 12px;
+  &.disabled {
+    border-color: #dcdee5;
+  }
+}
+
+.add-azure-cluster {
+  >>> .bk-form-item+.bk-form-item {
+    margin-top: 24px;
+  }
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/master.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/master.vue
new file mode 100644
index 0000000000..f753ebc6a5
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/master.vue
@@ -0,0 +1,363 @@
+<template>
+  <bk-form :model="masterConfig" :rules="masterConfigRules" ref="formRef">
+    <bk-form-item :label="$t('cluster.create.label.manageType.text')">
+      <div class="bk-button-group">
+        <bk-button
+          :class="['min-w-[136px]', { 'is-selected': masterConfig.manageType === 'MANAGED_CLUSTER' }]"
+          @click="handleChangeManageType('MANAGED_CLUSTER')">
+          <div class="flex items-center">
+            <span class="flex text-[16px] text-[#f85356]">
+              <i class="bcs-icon bcs-icon-hot"></i>
+            </span>
+            <span class="ml-[8px]">{{ $t('bcs.cluster.managed') }}</span>
+          </div>
+        </bk-button>
+      </div>
+      <div class="text-[12px] leading-[20px] mt-[4px]">
+        <span>{{ $t('cluster.create.label.manageType.managed.desc') }}</span>
+      </div>
+    </bk-form-item>
+    <bk-form-item
+      :label="$t('tke.label.apiServerCLB.text')"
+      :desc="$t('tke.label.apiServerCLB.desc')"
+      property="clusterAdvanceSettings.clusterConnectSetting.securityGroup"
+      error-display-type="normal"
+      key="securityGroup"
+      required>
+      <NetworkSelector
+        class="max-w-[600px]"
+        :value="masterConfig.clusterAdvanceSettings.clusterConnectSetting"
+        :region="region"
+        :cloud-account-i-d="cloudAccountID"
+        :cloud-i-d="cloudID"
+        :value-list="[
+          { label: $t('tke.label.apiServerCLB.internet'), value: 'internet' },
+          { label: $t('tke.label.apiServerCLB.intranet'), value: 'intranet' }
+        ]"
+        @change="(v) => masterConfig.clusterAdvanceSettings.clusterConnectSetting = v" />
+    </bk-form-item>
+    <div class="flex items-center h-[48px] bg-[#FAFBFD] px-[24px] fixed bottom-0 left-0 w-full bcs-border-top">
+      <bk-button @click="preStep">{{ $t('generic.button.pre') }}</bk-button>
+      <bk-button theme="primary" class="ml10" @click="nextStep">{{ $t('generic.button.next') }}</bk-button>
+      <bk-button class="ml10" @click="handleCancel">{{ $t('generic.button.cancel') }}</bk-button>
+    </div>
+  </bk-form>
+</template>
+<script setup lang="ts">
+import { computed, inject, PropType, ref, watch } from 'vue';
+
+import { ClusterDataInjectKey, IHostNode, IInstanceItem } from '../../../types/types';
+
+import { cloudInstanceTypesByLevel } from '@/api/modules/cluster-manager';
+import $bkInfo from '@/components/bk-magic-2.0/bk-info';
+import $i18n from '@/i18n/i18n-setup';
+import NetworkSelector from '@/views/cluster-manage/add/components/network-selector.vue';
+
+const props = defineProps({
+  region: {
+    type: String,
+    default: '',
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  cloudID: {
+    type: String,
+    default: '',
+  },
+  provider: {
+    type: String,
+    default: '',
+  },
+  vpcID: {
+    type: String,
+    default: '',
+  },
+  nodes: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+  },
+});
+
+const emits = defineEmits(['next', 'cancel', 'pre', 'resource-type', 'instances-change']);
+
+const clusterData = inject(ClusterDataInjectKey);
+const subnetZoneList = computed(() => {
+  if (!clusterData?.value) return [];
+
+  return clusterData.value?.clusterAdvanceSettings?.networkType === 'VPC-CNI'
+    ? clusterData.value?.networkSettings?.subnetSource?.new?.map(item => item.zone) || []
+    : [];
+});
+
+// master配置
+const masterConfig = ref({
+  manageType: 'MANAGED_CLUSTER',
+  autoGenerateMasterNodes: true,
+  master: [],
+  clusterBasicSettings: {
+    clusterLevel: 'L20',
+    isAutoUpgradeClusterLevel: true,
+    module: {
+      masterModuleID: '',
+    },
+  },
+  clusterAdvanceSettings: {
+    clusterConnectSetting: {
+      isExtranet: true,
+      subnetId: '',
+      securityGroup: [],
+    },
+  },
+  nodeSettings: {
+    masterLogin: {
+      initLoginUsername: '',
+      initLoginPassword: '',
+      keyPair: {
+        keyID: '',
+        keySecret: '',
+        keyPublic: '',
+      },
+    },
+  },
+});
+
+// 登录方式
+const loginType = ref<'password'|'ssh'>('password');
+const confirmPassword = ref('');
+// watch([
+//   () => masterConfig.value.nodeSettings.masterLogin.initLoginPassword,
+//   () => confirmPassword.value,
+//   () => masterConfig.value.nodeSettings.masterLogin.keyPair.keyID,
+//   () => masterConfig.value.nodeSettings.masterLogin.keyPair.keySecret,
+// ], () => {
+//   formRef.value?.$refs?.loginTypeRef?.validate();
+// });
+// 动态 i18n 问题，这里使用computed
+const masterConfigRules = computed(() => ({
+  'clusterBasicSettings.clusterLevel': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'custom',
+    },
+  ],
+  'clusterAdvanceSettings.clusterConnectSetting.securityGroup': [
+    {
+      trigger: 'blur',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        // todo ip校验
+        if (masterConfig.value.clusterAdvanceSettings.clusterConnectSetting.isExtranet) {
+          return !!masterConfig.value.clusterAdvanceSettings.clusterConnectSetting.securityGroup;
+        }
+        return true;
+      },
+    },
+  ],
+  master: [
+    {
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'custom',
+      validator: () => {
+        if (masterConfig.value.autoGenerateMasterNodes) {
+          return true;
+        }
+        return !!masterConfig.value.master.length;
+      },
+    },
+    {
+      message: $i18n.t('cluster.create.validate.masterNum35'),
+      trigger: 'custom',
+      validator: () => {
+        if (masterConfig.value.autoGenerateMasterNodes) {
+          return true;
+        }
+        const maxMasterNum = [3, 5];
+        return masterConfig.value.master.length && maxMasterNum.includes(masterConfig.value.master.length);
+      },
+    },
+  ],
+  'clusterBasicSettings.module.masterModuleID': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'custom',
+    },
+  ],
+  masterLogin: [
+    {
+      trigger: 'custom',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        if (loginType.value === 'password') {
+          return !!masterConfig.value.nodeSettings.masterLogin.initLoginPassword;
+        }
+        return !!masterConfig.value.nodeSettings.masterLogin.keyPair.keyID
+         && !!masterConfig.value.nodeSettings.masterLogin.keyPair.keySecret;
+      },
+    },
+    {
+      trigger: 'custom',
+      message: $i18n.t('cluster.ca.nodePool.create.validate.password'),
+      validator() {
+        if (loginType.value === 'password') {
+          const regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,30}$/;
+          return regex.test(masterConfig.value.nodeSettings.masterLogin.initLoginPassword);
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'custom',
+      message: $i18n.t('tke.validate.passwordNotSame'),
+      validator() {
+        if (loginType.value === 'password' && confirmPassword.value) {
+          return masterConfig.value.nodeSettings.masterLogin.initLoginPassword === confirmPassword.value;
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.passwordNotSame'),
+      validator() {
+        if (loginType.value === 'password') {
+          return masterConfig.value.nodeSettings.masterLogin.initLoginPassword === confirmPassword.value;
+        }
+        return true;
+      },
+    },
+  ],
+  // bk-form-item 在apply-host-resource组件中
+  instanceChargeType: [
+    {
+      trigger: 'custom',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        return !!instanceCommonConfig.value.instanceChargeType;
+      },
+    },
+  ],
+  // bk-form-item 在apply-host-resource组件中
+  instances: [{
+    trigger: 'custom',
+    message: $i18n.t('cluster.create.validate.masterNum35'),
+    validator() {
+      const count = instanceConfigList.value.reduce((pre, item) => {
+        pre += item.applyNum;
+        return pre;
+      }, 0);
+      return [3, 5].includes(count);
+    },
+  }],
+  // bk-form-item 在apply-host-resource组件中
+  securityGroupIDs: [
+    {
+      trigger: 'custom',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        return !!instanceCommonConfig.value.securityGroupIDs?.length;
+      },
+    },
+  ],
+}));
+
+// 机型配置
+const instanceLoading = ref(false);
+const instanceCommonConfig = ref<Partial<IInstanceItem>>({});
+
+const instanceConfigList = ref<Array<IInstanceItem>>([]);
+const instances = computed(() => instanceConfigList.value.map(item => ({
+  ...item,
+  ...instanceCommonConfig.value,
+  region: props.region,
+  vpcID: props.vpcID,
+  dockerGraphPath: '',
+})));
+watch(instances, () => {
+  formRef.value?.$refs?.applyHostResourceRef?.$refs?.instancesRef?.validate();
+  emits('instances-change', instances.value);
+});
+
+const level = ref('');
+const handleGetCloudInstanceTypesByLevel = async () => {
+  if (!props.region || !level.value || !props.cloudAccountID) return;
+
+  instanceLoading.value = true;
+  instanceConfigList.value = await cloudInstanceTypesByLevel({
+    $cloudId: props.cloudID,
+    $region: props.region,
+    $level: level.value,
+    vpcID: props.vpcID,
+    accountID: props.cloudAccountID,
+    zones: subnetZoneList.value.join(','),
+  }).catch(() => []);
+  if (!instanceConfigList.value.length) {
+    $bkInfo({
+      type: 'warning',
+      clsName: 'custom-info-confirm',
+      title: $i18n.t('tke.title.noAvailableSubnets'),
+      defaultInfo: true,
+      okText: $i18n.t('tke.button.addSubnets'),
+      confirmFn: async () => {
+        window.open(`https://console.cloud.tencent.com/vpc/vpc/detail?rid=1&id=${props.vpcID}`);
+      },
+    });
+  }
+  instanceLoading.value = false;
+};
+
+// master配置
+const handleChangeManageType = (type: 'INDEPENDENT_CLUSTER' | 'MANAGED_CLUSTER') => {
+  masterConfig.value.manageType = type;
+  masterConfig.value.master = [];
+  // validate();
+};
+watch([
+  () => props.region,
+  () => props.cloudAccountID,
+  () => props.vpcID,
+  () => subnetZoneList.value,
+], () => {
+  handleGetCloudInstanceTypesByLevel();
+});
+
+// 校验master节点
+const formRef = ref();
+const validate = async () => {
+  const result = await formRef.value?.validate().catch(() => false);
+  return result;
+};
+
+// 上一步
+const preStep = () => {
+  emits('pre');
+};
+// 下一步
+const nextStep = async () => {
+  const result = await validate();
+  if (result) {
+    emits('next', {
+      ...masterConfig.value,
+      master: (masterConfig.value.master as IHostNode[]).map(item => item.ip),
+    });
+  } else {
+    // 自动滚动到第一个错误的位置
+    const errDom = document.getElementsByClassName('form-error-tip');
+    errDom[0]?.scrollIntoView({
+      block: 'center',
+      behavior: 'smooth',
+    });
+  }
+};
+// 取消
+const handleCancel = () => {
+  emits('cancel');
+};
+
+defineExpose({
+  validate,
+});
+</script>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/network.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/network.vue
new file mode 100644
index 0000000000..386c724e15
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/network.vue
@@ -0,0 +1,634 @@
+<template>
+  <bk-form
+    class="k8s-form"
+    :label-width="160"
+    :model="networkConfig"
+    :rules="networkConfigRules"
+    ref="formRef">
+    <DescList size="middle" :title="$t('cluster.create.label.basicConfig')">
+      <bk-form-item :label="$t('cluster.create.label.region')" required>
+        <Region :value="region" :cloud-account-i-d="cloudAccountID" :cloud-i-d="cloudID" disabled />
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.label.privateNet.text')"
+        property="vpcID"
+        error-display-type="normal"
+        required
+        class="private-net-form-item">
+        <div class="flex items-center">
+          <Vpc
+            class="max-w-[576px] flex-1"
+            :cloud-account-i-d="cloudAccountID"
+            :cloud-i-d="cloudID"
+            :region="region"
+            init-data
+            v-model="networkConfig.vpcID"
+            @change="handleGetVpcDetail" />
+          <span
+            :class="[
+              'inline-flex items-center',
+              'px-[16px] h-[24px] rounded-full bg-[#F0F1F5] text-[12px] ml-[8px]'
+            ]"
+            v-if="networkConfig.clusterAdvanceSettings.networkType === 'VPC-CNI'">
+            {{ $t('tke.tips.totalIpNum', [vpcDetail.allocateIpNum || '--']) }}
+          </span>
+        </div>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.label.defaultNetPlugin')"
+        :desc="{
+          allowHTML: true,
+          content: '#netPlugin',
+        }"
+        property="clusterAdvanceSettings.networkType"
+        error-display-type="normal"
+        required>
+        <bcs-select :clearable="false" searchable v-model="networkConfig.clusterAdvanceSettings.networkType">
+          <bcs-option id="ACO" name="Azure CNI Overlay"></bcs-option>
+          <bcs-option id="ACNS" name="Azure CNI Node Subnet"></bcs-option>
+        </bcs-select>
+        <div id="netPlugin">
+          <div>{{ $t('tke.tips.grDesc') }}</div>
+          <div>{{ $t('tke.tips.vpcCniDesc') }}</div>
+          <div>
+            <i18n path="tke.button.goDetail">
+              <span
+                class="text-[12px] text-[#699DF4] cursor-pointer"
+                @click="openLink('https://cloud.tencent.com/document/product/457/50353')">
+                {{ $t('tke.link.netOverview') }}
+              </span>
+            </i18n>
+          </div>
+        </div>
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('cluster.create.label.clusterIPType.text')"
+        class="unset-form-content-width">
+        <bk-radio-group v-model="networkConfig.networkSettings.clusterIpType">
+          <bk-radio value="ipv4">
+            <span>IPv4</span>
+          </bk-radio>
+        </bk-radio-group>
+      </bk-form-item>
+    </DescList>
+    <DescList class="mt-[24px]" size="middle" :title="$t('cluster.create.label.netSetting')">
+      <!-- GR网络模式 -->
+      <template v-if="networkConfig.clusterAdvanceSettings.networkType === 'GR'">
+        <bk-form-item
+          :label="$t('tke.label.containerNet')"
+          :desc="{
+            allowHTML: true,
+            content: '#networkCIDR',
+          }"
+          property="networkSettings.clusterIPv4CIDR"
+          error-display-type="normal"
+          required>
+          <div class="flex items-center">
+            <div class="flex flex-1 max-w-[50%]">
+              <span class="prefix">CIDR</span>
+              <bk-input
+                class="ml-[-1px] flex-1"
+                :placeholder="$t('tke.placeholder.example', ['172.16.0.0/20'])"
+                v-model.trim="networkConfig.networkSettings.clusterIPv4CIDR">
+              </bk-input>
+            </div>
+            <span
+              class="inline-flex items-center px-[16px] h-[24px] rounded-full bg-[#F0F1F5] text-[12px] ml-[16px]">
+              {{ $t('tke.tips.totalIpNum', [countsClusterIPv4CIDR || '--']) }}
+            </span>
+          </div>
+          <div id="networkCIDR">
+            <div>{{ $t('tke.validate.minIpNum', [4096]) }}</div>
+            <div>{{ $t('tke.tips.supportCidr') }}</div>
+            <ul>
+              <li>- 10.0.0.0/8</li>
+              <li>- 172.16.0.0/16 ~ 172.31.0.0/16</li>
+              <li>- 192.168.0.0/16</li>
+            </ul>
+          </div>
+        </bk-form-item>
+        <bk-form-item
+          label="Service IP"
+          :desc="$t('tke.tips.ipCannotBeAdjustedWhenCreated', ['Service'])"
+          property="serviceIP"
+          error-display-type="normal"
+          required
+          key="GR-Service">
+          <div class="flex items-center">
+            <template v-if="['ipv4', 'dual'].includes(networkConfig.networkSettings.clusterIpType)">
+              <div class="flex-1 flex max-w-[50%]">
+                <span class="prefix">{{ $t('tke.label.ipNum') }}</span>
+                <bcs-select
+                  class="flex-1 ml-[-1px]"
+                  :clearable="false"
+                  searchable
+                  v-model="networkConfig.networkSettings.maxServiceNum">
+                  <bcs-option v-for="item in serviceIPList" :key="item" :id="item" :name="item"></bcs-option>
+                </bcs-select>
+              </div>
+            </template>
+          </div>
+        </bk-form-item>
+        <bk-form-item
+          label="Pod IP"
+          :desc="$t('tke.tips.podIpCalcFormula')"
+          property="podIP"
+          error-display-type="normal"
+          required
+          key="GR-Pod"
+          ref="podIpRef">
+          <template v-if="['ipv4', 'dual'].includes(networkConfig.networkSettings.clusterIpType)">
+            <div class="flex flex-1 max-w-[50%]">
+              <!-- GR模式时 pod ip = 网段总数 减去 service数量 -->
+              <span class="prefix">{{ $t('tke.label.ipNum') }}</span>
+              <bk-input
+                class="ml-[-1px] flex-1"
+                disabled
+                :value="maxPodNum">
+              </bk-input>
+            </div>
+          </template>
+        </bk-form-item>
+        <bk-form-item
+          :label="$t('cluster.create.label.maxNodePodNum')"
+          :desc="$t('tke.tips.ipCannotBeAdjustedWhenCreated2', [$t('cluster.create.label.maxNodePodNum')])"
+          property="networkSettings.maxNodePodNum"
+          error-display-type="normal"
+          required>
+          <bcs-select
+            searchable
+            :clearable="false"
+            class="mr-[8px] max-w-[50%]"
+            v-model="networkConfig.networkSettings.maxNodePodNum">
+            <bcs-option v-for="item in nodePodNumList" :id="item" :key="item" :name="item"></bcs-option>
+          </bcs-select>
+        </bk-form-item>
+      </template>
+      <!-- VPC-CNI模式 -->
+      <template v-else-if="networkConfig.clusterAdvanceSettings.networkType === 'VPC-CNI'">
+        <bk-form-item
+          label="Service"
+          :desc="$t('tke.tips.ipCannotBeAdjustedWhenCreated', ['Service'])"
+          property="serviceIP"
+          error-display-type="normal"
+          required
+          key="VPC-CNI-Service">
+          <div class="flex items-center">
+            <template v-if="['ipv4', 'dual'].includes(networkConfig.networkSettings.clusterIpType)">
+              <div class="flex-1 flex max-w-[50%]">
+                <bk-input
+                  class="mr-[24px] flex-1"
+                  :placeholder="$t('tke.placeholder.example', ['172.16.0.0/20'])"
+                  v-model.trim="networkConfig.networkSettings.serviceIPv4CIDR">
+                  <div
+                    slot="prepend"
+                    class="text-[12px] px-[12px] leading-[28px] whitespace-nowrap">
+                    CIDR
+                  </div>
+                </bk-input>
+              </div>
+              <span
+                class="inline-flex items-center px-[16px] h-[24px] rounded-full bg-[#F0F1F5] text-[12px] ml-[-8px]">
+                {{ $t('tke.tips.totalIpNum', [countIPsInCIDR(networkConfig.networkSettings.serviceIPv4CIDR) || 0]) }}
+              </span>
+            </template>
+          </div>
+        </bk-form-item>
+        <bk-form-item
+          label="Pod IP"
+          :desc="$t('tke.tips.vpcCniPodIp')"
+          property="podIP"
+          error-display-type="normal"
+          required
+          key="VPC-CNI-Pod-IP">
+          <template v-if="['ipv4', 'dual'].includes(networkConfig.networkSettings.clusterIpType)">
+            <VpcCni
+              :subnets="networkConfig.networkSettings.subnetSource.new"
+              :cloud-account-i-d="cloudAccountID"
+              :cloud-i-d="cloudID"
+              :region="region"
+              :show-zone="false"
+              @change="handleSetSubnetSourceNew" />
+          </template>
+        </bk-form-item>
+      </template>
+    </DescList>
+    <div class="flex items-center h-[48px] bg-[#FAFBFD] px-[24px] fixed bottom-0 left-0 w-full bcs-border-top">
+      <bk-button @click="preStep">{{ $t('generic.button.pre') }}</bk-button>
+      <bk-button
+        :loading="validating"
+        theme="primary"
+        class="ml10"
+        @click="nextStep">{{ $t('generic.button.next') }}</bk-button>
+      <bk-button class="ml10" @click="handleCancel">{{ $t('generic.button.cancel') }}</bk-button>
+    </div>
+  </bk-form>
+</template>
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
+import { IVpcItem } from '../../../types/types';
+
+import { cloudSecurityGroups } from '@/api/base';
+import { cloudCidrconflict, cloudVPC } from '@/api/modules/cluster-manager';
+import { cidrContains, countIPsInCIDR, validateCIDR } from '@/common/util';
+import DescList from '@/components/desc-list.vue';
+import $i18n from '@/i18n/i18n-setup';
+import Region from '@/views/cluster-manage/add/components/region.vue';
+import Vpc from '@/views/cluster-manage/add/components/vpc.vue';
+import VpcCni from '@/views/cluster-manage/components/vpc-cni.vue';
+
+const props = defineProps({
+  region: {
+    type: String,
+    default: '',
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  cloudID: {
+    type: String,
+    default: '',
+  },
+});
+
+const emits = defineEmits(['next', 'cancel', 'pre']);
+
+const nodePodNumList = ref([32, 64, 128]);
+const serviceIPList = ref([128, 256, 512, 1024, 2048, 4096]);
+
+// 网络配置
+const networkConfig = ref({
+  vpcID: '',
+  networkType: '', // overlay underlay
+  networkSettings: {
+    clusterIPv4CIDR: '',
+    serviceIPv4CIDR: '',
+    maxNodePodNum: 64, // 单节点pod数量上限
+    maxServiceNum: 128,
+    clusterIpType: 'ipv4', // ipv4/ipv6/dual
+    isStaticIpMode: false,
+    subnetSource: {
+      new: [],
+    },
+    securityGroupIDs: [], // 安全组
+  },
+  clusterAdvanceSettings: {
+    networkType: 'VPC-CNI',   // 网络插件
+  },
+});
+
+// 安全组
+const securityGroupsLoading = ref(false);
+const securityGroupsList = ref<any[]>([]);
+// const handleGetCloudSecurityGroups = async () => {
+//   securityGroupsLoading.value = true;
+//   const data = await cloudSecurityGroups({
+//     $cloudID: props.cloudID,
+//     resourceGroupName: cluster.value.extraInfo.nodeResourceGroup,
+//     accountID: cluster.value.cloudAccountID,
+//     region: cluster.value.region,
+//   });
+//   securityGroupsList.value = data.filter(item => item.securityGroupName !== 'default');
+//   securityGroupsLoading.value = false;
+// };
+
+const countsClusterIPv4CIDR = computed(() => countIPsInCIDR(networkConfig.value.networkSettings.clusterIPv4CIDR) || 0);
+const maxPodNum = computed(() => {
+  const counts = countsClusterIPv4CIDR.value - networkConfig.value.networkSettings.maxServiceNum;
+  return counts >= 0 ? counts : 0;
+});
+watch(() => props.region, () => {
+  networkConfig.value.networkSettings.subnetSource.new = [];
+});
+watch(() => networkConfig.value.clusterAdvanceSettings.networkType, () => {
+  if (networkConfig.value.clusterAdvanceSettings.networkType === 'GR') {
+    networkConfig.value.networkSettings.maxServiceNum = 128;
+    networkConfig.value.networkSettings.serviceIPv4CIDR = '';
+    networkConfig.value.networkSettings.subnetSource.new = [];
+  } else if (networkConfig.value.clusterAdvanceSettings.networkType === 'VPC-CNI') {
+    networkConfig.value.networkSettings.maxServiceNum = 0;
+    networkConfig.value.networkSettings.clusterIPv4CIDR = '';
+  }
+});
+const conflictCIDR = ref('');
+const networkConfigRules = ref({
+  vpcID: [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'clusterAdvanceSettings.networkType': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'networkSettings.clusterIpType': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'networkSettings.maxNodePodNum': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  'networkSettings.securityGroupIDs': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+  ],
+  // 容器网段（GR网络插件模式）
+  'networkSettings.clusterIPv4CIDR': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'blur',
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('generic.validate.cidr'),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'GR') {
+          return networkConfig.value.networkSettings.clusterIPv4CIDR
+              && validateCIDR(networkConfig.value.networkSettings.clusterIPv4CIDR);
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.minIpNum2', [4096]),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'GR') {
+          const counts = countIPsInCIDR(networkConfig.value.networkSettings.clusterIPv4CIDR) || 0;
+          return counts >= 4096;
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.cidrMaskLen', ['[10, 20]']),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'GR') {
+          const cidr = networkConfig.value.networkSettings.clusterIPv4CIDR;
+          const mask = Number(cidr?.split('/')?.[1] || 0);
+          return mask >= 10 && mask <= 20;
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.supportCidrList', ['10.0.0.0/8, 172.16.0.0/16 ~ 172.31.0.0/16, 192.168.0.0/16']),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'GR') {
+          const cidr = networkConfig.value.networkSettings.clusterIPv4CIDR;
+          return cidrContains(cidr, '10.0.0.0/8')
+            || cidrContains(cidr, ['172.16.0.0/16', '172.31.0.0/16'])
+            || cidrContains(cidr, '192.168.0.0/16');
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: () => $i18n.t('generic.validate.cidrConflict', { cidr: conflictCIDR.value }),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'GR') {
+          return networkConfig.value.networkSettings.clusterIPv4CIDR
+              && await cidrConflict(networkConfig.value.networkSettings.clusterIPv4CIDR);
+        }
+        return true;
+      },
+    },
+  ],
+  // service IP
+  serviceIP: [
+    {
+      trigger: 'blur',
+      message: $i18n.t('generic.validate.required'),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'GR') {
+          return !!networkConfig.value.networkSettings.maxServiceNum;
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('generic.validate.cidr'),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'VPC-CNI') {
+          return networkConfig.value.networkSettings.serviceIPv4CIDR
+            && validateCIDR(networkConfig.value.networkSettings.serviceIPv4CIDR);
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.minIpNum2', [128]),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'VPC-CNI') {
+          const counts = countIPsInCIDR(networkConfig.value.networkSettings.serviceIPv4CIDR) || 0;
+          return counts >= 128;
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.cidrMaskLen', ['[10, 24]']),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'VPC-CNI') {
+          const cidr = networkConfig.value.networkSettings.serviceIPv4CIDR;
+          const mask = Number(cidr?.split('/')?.[1] || 0);
+          return mask >= 10 && mask <= 24;
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.supportCidrList', ['10.0.0.0/8, 172.16.0.0/16 ~ 172.31.0.0/16, 192.168.0.0/16']),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'VPC-CNI') {
+          const cidr = networkConfig.value.networkSettings.serviceIPv4CIDR;
+          return cidrContains(cidr, '10.0.0.0/8')
+            || cidrContains(cidr, ['172.16.0.0/16', '172.31.0.0/16'])
+            || cidrContains(cidr, '192.168.0.0/16');
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: () => $i18n.t('generic.validate.cidrConflict', { cidr: conflictCIDR.value }),
+      async validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'VPC-CNI') {
+          return networkConfig.value.networkSettings.serviceIPv4CIDR
+            && await cidrConflict(networkConfig.value.networkSettings.serviceIPv4CIDR);
+        }
+        return true;
+      },
+    },
+  ],
+  // POD IP数量
+  podIP: [
+    {
+      trigger: 'blur',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'VPC-CNI') {
+          const subnetSource = networkConfig.value.networkSettings.subnetSource.new as Array<{
+            ipCnt: number
+            zone: string
+          }>;
+          return subnetSource.length && subnetSource.every(item => item.ipCnt && item.zone);
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.minPodIP'),
+      validator() {
+        if (networkConfig.value.clusterAdvanceSettings.networkType === 'VPC-CNI') {
+          return true;
+        }
+        return maxPodNum.value > 0;
+      },
+    },
+    {
+      trigger: 'custom',
+      message: $i18n.t('tke.validate.podIPsNeedLessThanVpcIPs'),
+      validator() {
+        const subnetSource = networkConfig.value.networkSettings.subnetSource.new as Array<{
+          ipCnt: number
+          zone: string
+        }>;
+        const counts = subnetSource.reduce((counts, item) => {
+          counts += item.ipCnt;
+          return counts;
+        }, 0);
+
+        return counts <= (vpcDetail.value.allocateIpNum || 0);
+      },
+    },
+  ],
+});
+const podIpRef = ref();
+const validatePodIP = () => {
+  podIpRef.value?.validate('blur');
+};
+watch(maxPodNum, () => {
+  validatePodIP();
+});
+// VPC详情
+const vpcDetail = ref<Partial<IVpcItem>>({});
+const handleGetVpcDetail = async (vpcID: string) => {
+  // 取数组第 1 个
+  const [detail] = await cloudVPC({
+    $cloudId: props.cloudID,
+    region: props.region,
+    accountID: props.cloudAccountID,
+    vpcID,
+  });
+  vpcDetail.value = detail;
+};
+
+// 设置vpc-cni子网
+const handleSetSubnetSourceNew = (data) => {
+  networkConfig.value.networkSettings.subnetSource.new = data;
+};
+
+// CIDR 冲突检测
+const cidrConflict = async (cidr) => {
+  if (!networkConfig.value.vpcID || !props.region || !props.cloudAccountID) return true;
+  const { cidrs = [] } =  await cloudCidrconflict({
+    $cloudId: props.cloudID,
+    $vpc: networkConfig.value.vpcID,
+    region: props.region,
+    accountID: props.cloudAccountID,
+    cidr,
+  }).catch(() => false);
+  conflictCIDR.value = cidrs.join(',');
+  return !cidrs.length;
+};
+
+watch([
+  () => props.region,
+  () => props.cloudAccountID,
+], () => {
+  networkConfig.value.vpcID = '';
+}, { immediate: true });
+
+// 跳转链接
+const openLink = (link: string) => {
+  if (!link) return;
+
+  window.open(link);
+};
+
+// 校验
+const formRef = ref();
+const validate = async () => {
+  const result = await formRef.value?.validate().catch(() => false);
+  return result;
+};
+
+// 上一步
+const preStep = () => {
+  emits('pre');
+};
+// 下一步
+const validating = ref(false);
+const nextStep = async () => {
+  validating.value = true;
+  const result = await validate();
+  validating.value = false;
+  if (result) {
+    emits('next', {
+      ...networkConfig.value,
+      networkType: networkConfig.value.clusterAdvanceSettings.networkType === 'GR' ? 'overlay' : 'underlay',
+    });
+  } else {
+    // 自动滚动到第一个错误的位置
+    const errDom = document.getElementsByClassName('form-error-tip');
+    errDom[0]?.scrollIntoView({
+      block: 'center',
+      behavior: 'smooth',
+    });
+  }
+};
+// 取消
+const handleCancel = () => {
+  emits('cancel');
+};
+
+defineExpose({
+  validate,
+});
+</script>
+<style scoped lang="postcss">
+>>> .private-net-form-item .bk-form-content {
+  max-width: 800px !important;
+}
+
+>>> .unset-form-content-width .bk-form-content {
+  max-width: none !important;
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/nodes.vue b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/nodes.vue
new file mode 100644
index 0000000000..c20efac869
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/create/azure-cloud/nodes.vue
@@ -0,0 +1,437 @@
+<template>
+  <bk-form :model="nodeConfig" :rules="nodeConfigRules" ref="formRef">
+    <bk-form-item :label="$t('cluster.create.label.initNodeTemplate')">
+      <TemplateSelector
+        class="max-w-[600px]"
+        v-model="nodeConfig.nodeTemplateID"
+        :provider="cloudID"
+        :show-preview="false" />
+    </bk-form-item>
+    <bk-form-item
+      key="master"
+      class="tips-offset"
+      :label="$t('cluster.create.label.hostResource')"
+      property="nodes"
+      error-display-type="normal"
+      required
+      ref="masterItemRef">
+      <bk-radio-group
+        class="flex items-center mb-[6px] h-[32px] max-w-[600px]"
+        v-model="nodeConfig.autoGenerateMasterNodes"
+        v-bk-tooltips="{
+          content: $t('tke.tips.needSameResourceType'),
+          disabled: !disableChooseResourceType,
+        }">
+        <bk-radio :disabled="disableChooseResourceType" :value="true">
+          {{ $t('cluster.create.label.applyResource') }}
+        </bk-radio>
+        <bk-radio :disabled="disableChooseResourceType" :value="false">
+          {{ $t('cluster.create.label.useExitHost') }}
+        </bk-radio>
+      </bk-radio-group>
+      <IpSelector
+        :region="region"
+        :cloud-id="provider"
+        :disabled-ip-list="disabledIpList"
+        :region-list="regionList"
+        :vpc="{ vpcID: vpcID }"
+        :account-i-d="cloudAccountID"
+        :available-zone-list="subnetZoneList"
+        v-model="nodeConfig.nodes"
+        class="max-w-[80%]"
+        v-if="!nodeConfig.autoGenerateMasterNodes"
+        @change="handleValidateNode" />
+    </bk-form-item>
+    <!-- 申请主机资源 -->
+    <template v-if="nodeConfig.autoGenerateMasterNodes">
+      <bcs-divider></bcs-divider>
+      <ApplyHostResource
+        class="mt-[8px] mb-[20px]"
+        :show-recommended-config="false"
+        :region="region"
+        :cloud-account-i-d="cloudAccountID"
+        :cloud-i-d="cloudID"
+        :vpc-i-d="vpcID"
+        :security-groups="securityGroups"
+        :instances="instanceConfigList"
+        :disable-data-disk="false"
+        :disable-internet-access="false"
+        :max-nodes="100"
+        node-role="WORKER"
+        v-bkloading="{ isLoading: instanceLoading }"
+        ref="applyHostResourceRef"
+        @instance-list-change="handleInstanceListChange"
+        @common-config-change="handleCommonConfigChange"
+        @delete-instance="handleDeleteInstance" />
+    </template>
+    <bk-form-item
+      :label="$t('tke.label.nodeModule.text')"
+      :desc="$t('tke.label.nodeModule.desc')"
+      property="clusterBasicSettings.module.workerModuleID"
+      error-display-type="normal"
+      required>
+      <TopoSelector
+        :placeholder="$t('generic.placeholder.select')"
+        v-model="nodeConfig.clusterBasicSettings.module.workerModuleID"
+        class="max-w-[600px]" />
+    </bk-form-item>
+    <!-- 用户名和密码 -->
+    <bk-form-item
+      :label="$t('tke.label.loginType.text')"
+      :desc="$t('tke.label.loginType.desc')"
+      property="workerLogin"
+      error-display-type="normal"
+      required
+      ref="loginTypeRef">
+      <LoginType
+        :region="region"
+        :cloud-account-i-d="cloudAccountID"
+        :cloud-i-d="cloudID"
+        :confirm-pass="confirmPassword"
+        :value="nodeConfig.nodeSettings.workerLogin"
+        :type="loginType"
+        @pass-blur="validateLogin('custom')"
+        @confirm-pass-blur="validateLogin('')"
+        @key-secret-blur="validateLogin('')"
+        @change="handleLoginValueChange"
+        @type-change="(v) => loginType = v"
+        @pass-change="handleConfirmPasswordChange" />
+    </bk-form-item>
+    <div class="flex items-center h-[48px] bg-[#FAFBFD] px-[24px] fixed bottom-0 left-0 w-full bcs-border-top">
+      <bk-button class="min-w-[88px]" @click="preStep">{{ $t('generic.button.pre') }}</bk-button>
+      <bk-button
+        theme="primary"
+        class="ml10 min-w-[88px]"
+        @click="handleConfirm">{{ $t('generic.button.confirm') }}</bk-button>
+      <bk-button class="ml10" @click="handleCancel">{{ $t('generic.button.cancel') }}</bk-button>
+    </div>
+  </bk-form>
+</template>
+<script setup lang="ts">
+import { computed, inject, PropType, ref, watch } from 'vue';
+
+import ApplyHostResource from './apply-host-resource.vue';
+import { ClusterDataInjectKey, IHostNode, IInstanceItem, ISecurityGroup } from '../../../types/types';
+
+import { cloudSecurityGroups } from '@/api/modules/cluster-manager';
+import $i18n from '@/i18n/i18n-setup';
+import $store from '@/store';
+import IpSelector from '@/views/cluster-manage/add/components/ip-selector.vue';
+import LoginType from '@/views/cluster-manage/add/components/login-type.vue';
+import TopoSelector from '@/views/cluster-manage/autoscaler/components/topo-select-tree.vue';
+import TemplateSelector from '@/views/cluster-manage/components/template-selector.vue';
+
+const props = defineProps({
+  region: {
+    type: String,
+    default: '',
+  },
+  cloudAccountID: {
+    type: String,
+    default: '',
+  },
+  cloudID: {
+    type: String,
+    default: '',
+  },
+  environment: {
+    type: String,
+    default: '',
+  },
+  provider: {
+    type: String,
+    default: '',
+  },
+  vpcID: {
+    type: String,
+    default: '',
+  },
+  master: {
+    type: Array as PropType<string[]>,
+    default: () => [],
+  },
+  masterLogin: {
+    type: Object,
+    default: () => ({
+      initLoginUsername: '',
+      initLoginPassword: '',
+      keyPair: {
+        keyID: '',
+        keySecret: '',
+        keyPublic: '',
+      },
+    }),
+  },
+  autoGenerateMasterNodes: {
+    type: Boolean,
+    default: false,
+  },
+  manageType: {
+    type: String as PropType<'MANAGED_CLUSTER'|'INDEPENDENT_CLUSTER'>,
+    default: 'MANAGED_CLUSTER',
+  },
+});
+
+const emits = defineEmits(['next', 'cancel', 'pre', 'confirm', 'instances-change']);
+
+const regionList = computed(() => $store.state.cloudMetadata.regionList);
+
+const disableChooseResourceType = computed(() => props.manageType === 'INDEPENDENT_CLUSTER');
+
+const clusterData = inject(ClusterDataInjectKey);
+const subnetZoneList = computed(() => {
+  if (!clusterData?.value) return [];
+
+  return clusterData.value?.clusterAdvanceSettings?.networkType === 'VPC-CNI'
+    ? clusterData.value?.networkSettings?.subnetSource?.new?.map(item => item.zone) || []
+    : [];
+});
+
+const disabledIpList = computed(() => props.master.map(ip => ({
+  ip,
+  tips: $i18n.t('cluster.create.validate.ipExitInMaster'),
+})));
+// node配置
+const nodeConfig = ref({
+  autoGenerateMasterNodes: false,
+  nodes: [],
+  nodeTemplateID: '',
+  clusterBasicSettings: {
+    module: {
+      workerModuleID: '',
+    },
+  },
+  nodeSettings: {
+    workerLogin: props.masterLogin,
+  },
+});
+watch(
+  [
+    () => props.autoGenerateMasterNodes,
+  ],
+  () => {
+    nodeConfig.value.autoGenerateMasterNodes = props.autoGenerateMasterNodes;
+  },
+  { immediate: true },
+);
+
+const watchOnce = watch(() => props.masterLogin, () => {
+  // 默认跟master密码保持一致
+  nodeConfig.value.nodeSettings.workerLogin = JSON.parse(JSON.stringify(props.masterLogin));
+  confirmPassword.value = nodeConfig.value.nodeSettings.workerLogin.initLoginPassword;
+  const { keyID, keySecret } = nodeConfig.value.nodeSettings.workerLogin?.keyPair || {};
+  if (keyID && keySecret) {
+    loginType.value = 'ssh';
+  } else {
+    loginType.value = 'password';
+  }
+  watchOnce();
+});
+
+// 登录方式
+const loginType = ref<'password'|'ssh'>('password');
+const confirmPassword = ref('');
+const validateLogin = (trigger = '') => {
+  formRef.value?.$refs?.loginTypeRef?.validate(trigger);
+};
+const handleLoginValueChange = (value) => {
+  nodeConfig.value.nodeSettings.workerLogin = value;
+};
+const handleConfirmPasswordChange = (v) => {
+  confirmPassword.value = v;
+};
+
+// watch([
+//   () => nodeConfig.value.nodeSettings.workerLogin.initLoginPassword,
+//   () => confirmPassword.value,
+//   () => nodeConfig.value.nodeSettings.workerLogin.keyPair.keyID,
+//   () => nodeConfig.value.nodeSettings.workerLogin.keyPair.keySecret,
+// ], () => {
+//   formRef.value?.$refs?.loginTypeRef?.validate();
+// });
+// 动态 i18n 问题，这里使用computed
+const nodeConfigRules = computed(() => ({
+  nodes: [{
+    message: $i18n.t('generic.validate.required'),
+    trigger: 'custom',
+    validator: () => {
+      if (nodeConfig.value.autoGenerateMasterNodes) {
+        return true;
+      }
+      return !!nodeConfig.value.nodes.length;
+    },
+  }],
+  'clusterBasicSettings.module.workerModuleID': [
+    {
+      required: true,
+      message: $i18n.t('generic.validate.required'),
+      trigger: 'custom',
+    },
+  ],
+  workerLogin: [
+    {
+      trigger: 'custom',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        if (loginType.value === 'password') {
+          return !!nodeConfig.value.nodeSettings.workerLogin.initLoginPassword;
+        }
+        return !!nodeConfig.value.nodeSettings.workerLogin.keyPair.keyID
+         && !!nodeConfig.value.nodeSettings.workerLogin.keyPair.keySecret;
+      },
+    },
+    {
+      trigger: 'custom',
+      message: $i18n.t('cluster.ca.nodePool.create.validate.password'),
+      validator() {
+        if (loginType.value === 'password') {
+          const regex = /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)[^]{8,30}$/;
+          return regex.test(nodeConfig.value.nodeSettings.workerLogin.initLoginPassword);
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'custom',
+      message: $i18n.t('tke.validate.passwordNotSame'),
+      validator() {
+        if (loginType.value === 'password' && confirmPassword.value) {
+          return nodeConfig.value.nodeSettings.workerLogin.initLoginPassword === confirmPassword.value;
+        }
+        return true;
+      },
+    },
+    {
+      trigger: 'blur',
+      message: $i18n.t('tke.validate.passwordNotSame'),
+      validator() {
+        if (loginType.value === 'password') {
+          return nodeConfig.value.nodeSettings.workerLogin.initLoginPassword === confirmPassword.value;
+        }
+        return true;
+      },
+    },
+  ],
+  // bk-form-item 在apply-host-resource组件中
+  instanceChargeType: [
+    {
+      trigger: 'custom',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        return !!instanceCommonConfig.value.instanceChargeType;
+      },
+    },
+  ],
+  // bk-form-item 在apply-host-resource组件中
+  instances: [{
+    trigger: 'custom',
+    message: $i18n.t('generic.validate.required'),
+    validator() {
+      const count = instanceConfigList.value.reduce((pre, item) => {
+        pre += item.applyNum;
+        return pre;
+      }, 0);
+      return count > 0;
+    },
+  }],
+  // bk-form-item 在apply-host-resource组件中
+  securityGroupIDs: [
+    {
+      trigger: 'custom',
+      message: $i18n.t('generic.validate.required'),
+      validator() {
+        return !!instanceCommonConfig.value.securityGroupIDs?.length;
+      },
+    },
+  ],
+}));
+
+const handleValidateNode = () => {
+  formRef.value?.$refs?.masterItemRef?.validate();
+};
+
+// 机型配置
+const instanceLoading = ref(false);
+const instanceCommonConfig = ref<Partial<IInstanceItem>>({});
+const handleCommonConfigChange = (config: Partial<IInstanceItem>) => {
+  instanceCommonConfig.value = config;
+};
+
+const instanceConfigList = ref<Array<IInstanceItem>>([]);
+const handleInstanceListChange = (data: IInstanceItem[]) => {
+  instanceConfigList.value = data;
+};
+const handleDeleteInstance = (index: number) => {
+  instanceConfigList.value.splice(index, 1);
+};
+const instances = computed(() => instanceConfigList.value.map(item => ({
+  ...item,
+  ...instanceCommonConfig.value,
+  region: props.region,
+  vpcID: props.vpcID,
+  dockerGraphPath: '',
+})));
+watch(instances, () => {
+  formRef.value?.$refs?.applyHostResourceRef?.$refs?.instancesRef?.validate();
+  emits('instances-change', instances.value);
+});
+
+// 安全组
+const securityGroupLoading = ref(false);
+const securityGroups = ref<Array<ISecurityGroup>>([]);
+const handleGetSecurityGroups = async () => {
+  if (!props.region || !props.cloudAccountID) return;
+  securityGroupLoading.value = true;
+  securityGroups.value = await cloudSecurityGroups({
+    $cloudId: props.cloudID,
+    accountID: props.cloudAccountID,
+    region: props.region,
+  }).catch(() => []);
+  securityGroupLoading.value = false;
+};
+
+watch([
+  () => props.region,
+  () => props.cloudAccountID,
+], () => {
+  handleGetSecurityGroups();
+});
+
+// 校验master节点
+const formRef = ref();
+const validate = async () => {
+  const result = await formRef.value?.validate().catch(() => false);
+  return result;
+};
+
+// 上一步
+const preStep = () => {
+  emits('pre');
+};
+// 下一步
+const handleConfirm = async () => {
+  const result = await validate();
+  if (result) {
+    emits('next', {
+      ...nodeConfig.value,
+      nodes: (nodeConfig.value.nodes as IHostNode[]).map(item => item.ip),
+    });
+    emits('confirm');
+  } else {
+    // 自动滚动到第一个错误的位置
+    const errDom = document.getElementsByClassName('form-error-tip');
+    errDom[0]?.scrollIntoView({
+      block: 'center',
+      behavior: 'smooth',
+    });
+  }
+};
+// 取消
+const handleCancel = () => {
+  emits('cancel');
+};
+
+defineExpose({
+  validate,
+});
+</script>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/import/google-cloud.vue b/bcs-ui/frontend/src/views/cluster-manage/add/import/google-cloud.vue
index 908c8979da..08385dd704 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/add/import/google-cloud.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/import/google-cloud.vue
@@ -364,7 +364,7 @@ onBeforeMount(() => {
   color: #3a84ff;
   cursor: pointer;
   position: absolute;
-  right: -20px
+  right: -20px;
 }
 
 >>> .badge-icon {
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/import/import-cluster.vue b/bcs-ui/frontend/src/views/cluster-manage/add/import/import-cluster.vue
index 74009ef06a..7b030dcc60 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/add/import/import-cluster.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/import/import-cluster.vue
@@ -1,206 +1,212 @@
 <template>
-  <section class="create-import-cluster !overflow-auto">
-    <BkForm
-      :label-width="labelWidth"
-      :model="importClusterInfo"
-      :rules="formRules"
-      class="import-form"
-      ref="importFormRef">
-      <BkFormItem :label="$t('cluster.labels.name')" property="clusterName" error-display-type="normal" required>
-        <bk-input :maxlength="64" v-model="importClusterInfo.clusterName"></bk-input>
-      </BkFormItem>
-      <!-- <BkFormItem :label="$t('cluster.create.label.importType')">
-        <bk-radio-group class="btn-group" v-model="importClusterInfo.importType">
-          <bk-radio class="btn-group-first" value="kubeconfig">kubeconfig</bk-radio>
-          <bk-radio value="provider">{{$t('cluster.create.label.provider')}}</bk-radio>
-        </bk-radio-group>
-      </BkFormItem> -->
-      <BkFormItem :label="$t('cluster.labels.env')" required v-if="$INTERNAL">
-        <bk-radio-group class="btn-group" v-model="importClusterInfo.environment">
-          <bk-radio class="btn-group-first" value="debug">
-            {{ $t('cluster.env.debug') }}
-          </bk-radio>
-          <bk-radio value="prod">
-            {{ $t('cluster.env.prod') }}
-          </bk-radio>
-        </bk-radio-group>
-      </BkFormItem>
-      <BkFormItem :label="$t('cluster.create.label.desc1')">
-        <bcs-input
-          :maxlength="100"
-          class="max-w-[640px]"
-          v-model="importClusterInfo.description"
-          type="textarea">
-        </bcs-input>
-      </BkFormItem>
-      <template v-if="importClusterInfo.importType === 'provider'">
-        <!-- <BkFormItem
-          :label="$t('cluster.create.label.provider')"
-          property="provider"
-          error-display-type="normal"
-          required>
-          <bcs-select
-            :loading="templateLoading"
-            class="w640"
-            v-model="importClusterInfo.provider"
-            :clearable="false">
-            <bcs-option
-              v-for="item in availableTemplateList"
-              :key="item.cloudID"
-              :id="item.cloudID"
-              :name="item.name">
-            </bcs-option>
-          </bcs-select>
-        </BkFormItem> -->
-        <BkFormItem
-          :label="$t('cluster.create.label.cloudToken')"
-          property="accountID"
-          error-display-type="normal"
-          required>
-          <div style="display: flex;">
-            <bcs-select
-              :loading="accountsLoading"
-              class="w640"
-              :clearable="false"
-              searchable
-              v-model="importClusterInfo.accountID">
-              <bcs-option
-                v-for="item in accountsList"
-                :key="item.account.accountID"
-                :id="item.account.accountID"
-                :name="item.account.accountName"
-                v-authority="{
-                  clickable: webAnnotations.perms[item.account.accountID]
-                    && webAnnotations.perms[item.account.accountID].cloud_account_use,
-                  actionId: 'cloud_account_use',
-                  resourceName: item.account.accountName,
-                  disablePerms: true,
-                  permCtx: {
-                    project_id: item.account.projectID,
-                    account_id: item.account.accountID,
-                    operator: user.username
-                  }
-                }">
-              </bcs-option>
-              <template slot="extension">
-                <div class="extension-item" style="cursor: pointer" @click="handleGotoCloudToken">
-                  <i class="bk-icon icon-plus-circle"></i>
-                  <span>{{ $t('cluster.create.button.createCloudToken') }}</span>
-                </div>
-              </template>
-            </bcs-select>
+   <div class="flex items-start justify-center py-[24px] overflow-auto">
+    <div class="shadow bg-[#fff] px-[24px] py-[16px] pb-[32px] min-w-[800px]">
+      <div class="text-[14px] font-bold mb-[24px]">{{ $t('cluster.create.label.title') }}</div>
+      <section class="create-import-cluster">
+        <BkForm
+          :label-width="150"
+          :model="importClusterInfo"
+          :rules="formRules"
+          class="import-form max-w-[640px]"
+          ref="importFormRef">
+          <BkFormItem :label="$t('cluster.labels.name')" property="clusterName" error-display-type="normal" required>
+            <bk-input class="w640" :maxlength="64" v-model="importClusterInfo.clusterName"></bk-input>
+          </BkFormItem>
+          <!-- <BkFormItem :label="$t('cluster.create.label.importType')">
+            <bk-radio-group class="btn-group" v-model="importClusterInfo.importType">
+              <bk-radio class="btn-group-first" value="kubeconfig">kubeconfig</bk-radio>
+              <bk-radio value="provider">{{$t('cluster.create.label.provider')}}</bk-radio>
+            </bk-radio-group>
+          </BkFormItem> -->
+          <BkFormItem :label="$t('cluster.labels.env')" required v-if="$INTERNAL">
+            <bk-radio-group class="btn-group" v-model="importClusterInfo.environment">
+              <bk-radio class="btn-group-first" value="debug">
+                {{ $t('cluster.env.debug') }}
+              </bk-radio>
+              <bk-radio value="prod">
+                {{ $t('cluster.env.prod') }}
+              </bk-radio>
+            </bk-radio-group>
+          </BkFormItem>
+          <BkFormItem :label="$t('cluster.create.label.desc1')">
+            <bcs-input
+              :maxlength="100"
+              class="w640 max-w-[640px]"
+              v-model="importClusterInfo.description"
+              type="textarea">
+            </bcs-input>
+          </BkFormItem>
+          <template v-if="importClusterInfo.importType === 'provider'">
+            <!-- <BkFormItem
+              :label="$t('cluster.create.label.provider')"
+              property="provider"
+              error-display-type="normal"
+              required>
+              <bcs-select
+                :loading="templateLoading"
+                class="w640"
+                v-model="importClusterInfo.provider"
+                :clearable="false">
+                <bcs-option
+                  v-for="item in availableTemplateList"
+                  :key="item.cloudID"
+                  :id="item.cloudID"
+                  :name="item.name">
+                </bcs-option>
+              </bcs-select>
+            </BkFormItem> -->
+            <BkFormItem
+              :label="$t('cluster.create.label.cloudToken')"
+              property="accountID"
+              error-display-type="normal"
+              required>
+              <div style="display: flex;">
+                <bcs-select
+                  :loading="accountsLoading"
+                  class="w640"
+                  :clearable="false"
+                  searchable
+                  v-model="importClusterInfo.accountID">
+                  <bcs-option
+                    v-for="item in accountsList"
+                    :key="item.account.accountID"
+                    :id="item.account.accountID"
+                    :name="item.account.accountName"
+                    v-authority="{
+                      clickable: webAnnotations.perms[item.account.accountID]
+                        && webAnnotations.perms[item.account.accountID].cloud_account_use,
+                      actionId: 'cloud_account_use',
+                      resourceName: item.account.accountName,
+                      disablePerms: true,
+                      permCtx: {
+                        project_id: item.account.projectID,
+                        account_id: item.account.accountID,
+                        operator: user.username
+                      }
+                    }">
+                  </bcs-option>
+                  <template slot="extension">
+                    <div class="extension-item" style="cursor: pointer" @click="handleGotoCloudToken">
+                      <i class="bk-icon icon-plus-circle"></i>
+                      <span>{{ $t('cluster.create.button.createCloudToken') }}</span>
+                    </div>
+                  </template>
+                </bcs-select>
+                <span
+                  class="refresh ml10"
+                  v-bk-tooltips="$t('generic.button.refresh')"
+                  @click="handleGetCloudAccounts">
+                  <i class="bcs-icon bcs-icon-reset"></i>
+                </span>
+              </div>
+            </BkFormItem>
+            <BkFormItem :label="$t('cluster.create.label.region')" property="region" error-display-type="normal" required>
+              <bcs-select
+                :loading="regionLoading"
+                class="w640"
+                searchable
+                :clearable="false"
+                v-model="importClusterInfo.region">
+                <bcs-option
+                  v-for="item in regionList"
+                  :key="item.region"
+                  :id="item.region"
+                  :name="item.regionName">
+                </bcs-option>
+              </bcs-select>
+            </BkFormItem>
+            <BkFormItem
+              :label="$t('cluster.labels.cloudClusterID')"
+              property="cloudID"
+              error-display-type="normal"
+              required>
+              <bcs-select
+                class="w640" searchable
+                :clearable="false"
+                :loading="clusterLoading"
+                v-model="importClusterInfo.cloudID">
+                <bcs-option
+                  v-for="item in clusterList"
+                  :key="item.clusterID"
+                  :id="item.clusterID"
+                  :name="item.clusterName">
+                </bcs-option>
+              </bcs-select>
+            </BkFormItem>
+            <BkFormItem
+              :label="$t('cluster.create.label.network.text')"
+              property="isExtranet"
+              error-display-type="normal"
+              required>
+              <bcs-select :clearable="false" class="w640" v-model="importClusterInfo.isExtranet">
+                <bcs-option id="false" :name="$t('cluster.create.label.network.intranet')"></bcs-option>
+                <bcs-option id="true" :name="$t('cluster.create.label.network.extranet')"></bcs-option>
+              </bcs-select>
+            </BkFormItem>
+            <bk-form-item
+              :label="$t('importGoogleCloud.label.nodemanArea')"
+              property="area.bkCloudID"
+              error-display-type="normal"
+              required>
+              <NodeManArea class="w640" v-model="importClusterInfo.area.bkCloudID" />
+            </bk-form-item>
+          </template>
+          <BkFormItem
+            :label="$t('cluster.create.label.kubeConfig')"
+            property="yaml"
+            error-display-type="normal"
+            required
+            v-else>
+            <bk-button class="mb10">
+              <input
+                class="file-input"
+                accept="*"
+                type="file"
+                @change="handleFileChange">
+              {{$t('cluster.create.button.fileImport')}}
+            </bk-button>
+            <CodeEditor
+              class="cube-config"
+              lang="yaml"
+              width="100%"
+              :height="480"
+              :options="{ lineNumbers: 'off' }"
+              ref="codeEditorRef"
+              v-model="importClusterInfo.yaml"
+            ></CodeEditor>
+          </BkFormItem>
+          <BkFormItem class="mt32">
+            <bk-button
+              theme="primary"
+              class="mr-[5px]"
+              :loading="testLoading"
+              :disabled="importClusterInfo.importType === 'provider'
+                ? !importClusterInfo.cloudID
+                : !importClusterInfo.yaml"
+              @click="handleTest">{{$t('cluster.create.button.textKubeConfig')}}</bk-button>
             <span
-              class="refresh ml10"
-              v-bk-tooltips="$t('generic.button.refresh')"
-              @click="handleGetCloudAccounts">
-              <i class="bcs-icon bcs-icon-reset"></i>
+              v-bk-tooltips="{
+                content: $t('cluster.create.validate.emptyKubeConfig'),
+                disabled: isTestSuccess
+              }">
+              <bk-button
+                class="btn"
+                theme="primary"
+                :loading="loading"
+                :disabled="!isTestSuccess"
+                @click="handleImport"
+              >{{$t('generic.button.import')}}</bk-button>
             </span>
-          </div>
-        </BkFormItem>
-        <BkFormItem :label="$t('cluster.create.label.region')" property="region" error-display-type="normal" required>
-          <bcs-select
-            :loading="regionLoading"
-            class="w640"
-            searchable
-            :clearable="false"
-            v-model="importClusterInfo.region">
-            <bcs-option
-              v-for="item in regionList"
-              :key="item.region"
-              :id="item.region"
-              :name="item.regionName">
-            </bcs-option>
-          </bcs-select>
-        </BkFormItem>
-        <BkFormItem
-          :label="$t('cluster.labels.cloudClusterID')"
-          property="cloudID"
-          error-display-type="normal"
-          required>
-          <bcs-select
-            class="w640" searchable
-            :clearable="false"
-            :loading="clusterLoading"
-            v-model="importClusterInfo.cloudID">
-            <bcs-option
-              v-for="item in clusterList"
-              :key="item.clusterID"
-              :id="item.clusterID"
-              :name="item.clusterName">
-            </bcs-option>
-          </bcs-select>
-        </BkFormItem>
-        <BkFormItem
-          :label="$t('cluster.create.label.network.text')"
-          property="isExtranet"
-          error-display-type="normal"
-          required>
-          <bcs-select :clearable="false" class="w640" v-model="importClusterInfo.isExtranet">
-            <bcs-option id="false" :name="$t('cluster.create.label.network.intranet')"></bcs-option>
-            <bcs-option id="true" :name="$t('cluster.create.label.network.extranet')"></bcs-option>
-          </bcs-select>
-        </BkFormItem>
-        <bk-form-item
-          :label="$t('importGoogleCloud.label.nodemanArea')"
-          property="area.bkCloudID"
-          error-display-type="normal"
-          required>
-          <NodeManArea class="w640" v-model="importClusterInfo.area.bkCloudID" />
-        </bk-form-item>
-      </template>
-      <BkFormItem
-        :label="$t('cluster.create.label.kubeConfig')"
-        property="yaml"
-        error-display-type="normal"
-        required
-        v-else>
-        <bk-button class="mb10">
-          <input
-            class="file-input"
-            accept="*"
-            type="file"
-            @change="handleFileChange">
-          {{$t('cluster.create.button.fileImport')}}
-        </bk-button>
-        <CodeEditor
-          class="cube-config"
-          lang="yaml"
-          width="100%"
-          :height="480"
-          :options="{ lineNumbers: 'off' }"
-          ref="codeEditorRef"
-          v-model="importClusterInfo.yaml"
-        ></CodeEditor>
-      </BkFormItem>
-      <BkFormItem class="mt32">
-        <bk-button
-          theme="primary"
-          class="mr-[5px]"
-          :loading="testLoading"
-          :disabled="importClusterInfo.importType === 'provider'
-            ? !importClusterInfo.cloudID
-            : !importClusterInfo.yaml"
-          @click="handleTest">{{$t('cluster.create.button.textKubeConfig')}}</bk-button>
-        <span
-          v-bk-tooltips="{
-            content: $t('cluster.create.validate.emptyKubeConfig'),
-            disabled: isTestSuccess
-          }">
-          <bk-button
-            class="btn"
-            theme="primary"
-            :loading="loading"
-            :disabled="!isTestSuccess"
-            @click="handleImport"
-          >{{$t('generic.button.import')}}</bk-button>
-        </span>
-        <bk-button
-          class="btn ml5"
-          @click="handleCancel"
-        >{{$t('generic.button.cancel')}}</bk-button>
-      </BkFormItem>
-    </BkForm>
-  </section>
+            <bk-button
+              class="btn ml5"
+              @click="handleCancel"
+            >{{$t('generic.button.cancel')}}</bk-button>
+          </BkFormItem>
+        </BkForm>
+      </section>
+    </div>
+  </div>
+  
 </template>
 <script lang="ts">
 import BkForm from 'bk-magic-vue/lib/form';
@@ -529,16 +535,10 @@ export default defineComponent({
   margin-top: 32px;
 }
 .create-import-cluster {
-  padding: 24px;
   /deep/ .w640 {
-      width: 640px;
-      background: #fff;
-  }
-  /deep/ .bk-input-text {
-      width: 640px;
+      width: 490px;
   }
   /deep/ .bk-textarea-wrapper {
-      width: 640px;
       height: 80px;
       background-color: #fff;
   }
@@ -572,5 +572,7 @@ export default defineComponent({
   font-size: 12px;
   color: #3a84ff;
   cursor: pointer;
+  position: absolute;
+  right: -20px;
 }
 </style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/add/index.vue b/bcs-ui/frontend/src/views/cluster-manage/add/index.vue
index 9f61665f67..0bdb341717 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/add/index.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/add/index.vue
@@ -123,8 +123,8 @@ export default defineComponent({
             icon: amazonLogo,
             title: $i18n.t('publicCloud.amazon.title'),
             desc: $i18n.t('publicCloud.amazon.desc'),
-            type: 'amazonCloud',
-            disabled: true,
+            type: 'aws',
+            disabled: false,
           },
           {
             icon: googleLogo,
@@ -273,6 +273,14 @@ export default defineComponent({
           // 创建腾讯云公有云集群
           $router.push({ name: 'createTKECluster' });
           break;
+        case 'aws':
+          // 创建aws云集群
+          $router.push({ name: 'CreateAWSCloudCluster' });
+          break;
+        case 'azureCloud':
+          // 创建azure云集群
+          $router.push({ name: 'CreateAzureCloudCluster' });
+          break;
         case 'k8s':
           $router.push({ name: 'createK8SCluster' });
           break;
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/aws/edit-node-pool.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/aws/edit-node-pool.vue
index 48f68db829..a2a4c0f633 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/aws/edit-node-pool.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/aws/edit-node-pool.vue
@@ -51,6 +51,7 @@ import $router from '@/router/index';
 import $store from '@/store/index';
 import { useClusterList } from '@/views/cluster-manage/cluster/use-cluster';
 import HeaderNav from '@/views/cluster-manage/components/header-nav.vue';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 
 export default defineComponent({
   components: {
@@ -131,12 +132,16 @@ export default defineComponent({
       return data;
     };
 
+    const { focusOnErrorField } = useFocusOnErrorField();
     // 保存
     const user = computed(() => $store.state.user);
     const saveLoading = ref(false);
     const handleEditNodePool = async () => {
       const nodePoolInfoValidate = await nodePoolInfoRef.value?.validate();
       const nodePoolConfigValidate = await nodePoolConfigRef.value?.validate();
+      if (!nodePoolConfigValidate) {
+        focusOnErrorField()
+      }
       if (!nodePoolInfoValidate || !nodePoolConfigValidate) return;
 
       saveLoading.value = true;
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/aws/node-config.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/aws/node-config.vue
index b3bf0e6776..f3e565cfcd 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/aws/node-config.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/aws/node-config.vue
@@ -388,6 +388,7 @@ import { computed, defineComponent, onMounted, ref, toRefs, watch } from 'vue';
 
 import FormGroup from '@/components/form-group.vue';
 import usePage from '@/composables/use-page';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 import $i18n from '@/i18n/i18n-setup';
 import $router from '@/router';
 import $store from '@/store/index';
@@ -867,40 +868,33 @@ export default defineComponent({
     const validate = async () => {
       const basicFormValidate = await basicFormRef.value?.validate().catch(() => false);
       if (!basicFormValidate && nodeConfigRef.value) {
-        nodeConfigRef.value.scrollTop = 0;
+        // nodeConfigRef.value.scrollTop = 0;
         return false;
       }
       // 校验机型
       if (!nodePoolConfig.value.launchTemplate.instanceType) {
-        nodeConfigRef.value.scrollTop = 20;
+        // nodeConfigRef.value.scrollTop = 20;
         return false;
       }
       const result = await formRef.value?.validate().catch(() => false);
-      if (!result && nodeConfigRef.value) {
-        nodeConfigRef.value.scrollTop = nodeConfigRef.value.scrollHeight;
-      }
+      // if (!result && nodeConfigRef.value) {
+      //   nodeConfigRef.value.scrollTop = nodeConfigRef.value.scrollHeight;
+      // }
       // eslint-disable-next-line max-len
       const validateDataDiskSize = nodePoolConfig.value.nodeTemplate.dataDisks.every(item => item.diskSize % 10 === 0);
       if (!basicFormValidate || !result || !validateDataDiskSize) return false;
 
       return true;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
     const handleNext = async () => {
       isShowTip.value = false;
       // 校验错误滚动到第一个错误的位置
       const result = await validate();
       if (!result) {
-        // 自动滚动到第一个错误的位置
-        const errDom = document.getElementsByClassName('form-error-tip');
-        const bcsErrDom = document.getElementsByClassName('error-tips');
-        const innerErrDom = document.getElementsByClassName('is-error');
-        const firstErrDom = innerErrDom[0] || errDom[0] || bcsErrDom[0];
-        firstErrDom?.scrollIntoView({
-          block: 'center',
-          behavior: 'smooth',
-        });
+        focusOnErrorField();
         return;
-      }
+      };
       ctx.emit('next', getNodePoolData());
     };
 
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/edit-node-pool.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/edit-node-pool.vue
index 48f68db829..8330038be7 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/edit-node-pool.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/edit-node-pool.vue
@@ -51,6 +51,7 @@ import $router from '@/router/index';
 import $store from '@/store/index';
 import { useClusterList } from '@/views/cluster-manage/cluster/use-cluster';
 import HeaderNav from '@/views/cluster-manage/components/header-nav.vue';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 
 export default defineComponent({
   components: {
@@ -130,6 +131,7 @@ export default defineComponent({
       });
       return data;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
 
     // 保存
     const user = computed(() => $store.state.user);
@@ -137,6 +139,9 @@ export default defineComponent({
     const handleEditNodePool = async () => {
       const nodePoolInfoValidate = await nodePoolInfoRef.value?.validate();
       const nodePoolConfigValidate = await nodePoolConfigRef.value?.validate();
+      if (!nodePoolConfigValidate) {
+        focusOnErrorField()
+      }
       if (!nodePoolInfoValidate || !nodePoolConfigValidate) return;
 
       saveLoading.value = true;
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/node-config.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/node-config.vue
index 3e1cd68103..2351ea82a2 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/node-config.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/azure/node-config.vue
@@ -347,6 +347,7 @@ import { computed, defineComponent, onMounted, ref, toRefs, watch } from 'vue';
 import { cloudsZones } from '@/api/modules/cluster-manager';
 import FormGroup from '@/components/form-group.vue';
 import usePage from '@/composables/use-page';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 import $i18n from '@/i18n/i18n-setup';
 import $router from '@/router';
 import $store from '@/store/index';
@@ -821,43 +822,36 @@ export default defineComponent({
     const validate = async () => {
       const basicFormValidate = await basicFormRef.value?.validate().catch(() => false);;
       if (!basicFormValidate && nodeConfigRef.value) {
-        nodeConfigRef.value.scrollTop = 0;
+        // nodeConfigRef.value.scrollTop = 0;
         return false;
       }
       // 校验机型
       if (!nodePoolConfig.value.launchTemplate.instanceType) {
-        nodeConfigRef.value.scrollTop = 20;
+        // nodeConfigRef.value.scrollTop = 20;
         return false;
       }
       const result = await formRef.value?.validate().catch(() => false);
-      if (!result && nodeConfigRef.value) {
-        if (!nodePoolConfig.value.autoScaling?.zones?.length) {
-          nodeConfigRef.value.scrollTop = 0;
-        } else {
-          nodeConfigRef.value.scrollTop = nodeConfigRef.value.scrollHeight;
-        }
-      }
+      // if (!result && nodeConfigRef.value) {
+      //   if (!nodePoolConfig.value.autoScaling?.zones?.length) {
+      //     nodeConfigRef.value.scrollTop = 0;
+      //   } else {
+      //     nodeConfigRef.value.scrollTop = nodeConfigRef.value.scrollHeight;
+      //   }
+      // }
       // eslint-disable-next-line max-len
       const validateDataDiskSize = nodePoolConfig.value.nodeTemplate.dataDisks.every(item => item.diskSize % 10 === 0);
       if (!basicFormValidate || !result || !validateDataDiskSize) return false;
 
       return true;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
     const handleNext = async () => {
       // 校验错误滚动到第一个错误的位置
       const result = await validate();
       if (!result) {
-        // 自动滚动到第一个错误的位置
-        const errDom = document.getElementsByClassName('form-error-tip');
-        const bcsErrDom = document.getElementsByClassName('error-tips');
-        const innerErrDom = document.getElementsByClassName('is-error');
-        const firstErrDom = innerErrDom[0] || errDom[0] || bcsErrDom[0];
-        firstErrDom?.scrollIntoView({
-          block: 'center',
-          behavior: 'smooth',
-        });
+        focusOnErrorField();
         return;
-      }
+      };
       ctx.emit('next', getNodePoolData());
     };
 
@@ -927,6 +921,7 @@ export default defineComponent({
       handleCancel,
       getSchemaByProp,
       validate,
+      focusOnErrorField,
       getNodePoolData,
       CPU,
       Mem,
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/google/edit-node-pool.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/google/edit-node-pool.vue
index e4a14138df..52577be058 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/google/edit-node-pool.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/google/edit-node-pool.vue
@@ -51,6 +51,7 @@ import $router from '@/router/index';
 import $store from '@/store/index';
 import { useClusterList } from '@/views/cluster-manage/cluster/use-cluster';
 import HeaderNav from '@/views/cluster-manage/components/header-nav.vue';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 
 export default defineComponent({
   components: {
@@ -130,6 +131,7 @@ export default defineComponent({
       });
       return data;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
 
     // 保存
     const user = computed(() => $store.state.user);
@@ -137,6 +139,9 @@ export default defineComponent({
     const handleEditNodePool = async () => {
       const nodePoolInfoValidate = await nodePoolInfoRef.value?.validate();
       const nodePoolConfigValidate = await nodePoolConfigRef.value?.validate();
+      if (!nodePoolConfigValidate) {
+        focusOnErrorField()
+      }
       if (!nodePoolInfoValidate || !nodePoolConfigValidate) return;
 
       saveLoading.value = true;
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/google/node-config.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/google/node-config.vue
index 449a37230c..f714a3f99a 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/google/node-config.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/google/node-config.vue
@@ -288,6 +288,7 @@ import { computed, defineComponent, onMounted, ref, toRefs, watch } from 'vue';
 import { cloudsZones } from '@/api/modules/cluster-manager';
 import FormGroup from '@/components/form-group.vue';
 import usePage from '@/composables/use-page';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 import $i18n from '@/i18n/i18n-setup';
 import $router from '@/router';
 import $store from '@/store/index';
@@ -667,31 +668,37 @@ export default defineComponent({
     const validate = async () => {
       const basicFormValidate = await basicFormRef.value?.validate().catch(() => false);;
       if (!basicFormValidate && nodeConfigRef.value) {
-        nodeConfigRef.value.scrollTop = 0;
+        // nodeConfigRef.value.scrollTop = 0;
         return false;
       }
       // 校验机型
       if (!nodePoolConfig.value.launchTemplate.instanceType) {
-        nodeConfigRef.value.scrollTop = 20;
+        // nodeConfigRef.value.scrollTop = 20;
         return false;
       }
       const result = await formRef.value?.validate().catch(() => false);
-      if (!result && nodeConfigRef.value) {
-        if (!nodePoolConfig.value.autoScaling?.zones?.length) {
-          nodeConfigRef.value.scrollTop = 0;
-        } else {
-          nodeConfigRef.value.scrollTop = nodeConfigRef.value.scrollHeight;
-        }
-      }
+      // if (!result && nodeConfigRef.value) {
+      //   if (!nodePoolConfig.value.autoScaling?.zones?.length) {
+      //     nodeConfigRef.value.scrollTop = 0;
+      //   } else {
+      //     nodeConfigRef.value.scrollTop = nodeConfigRef.value.scrollHeight;
+      //   }
+      // }
       // eslint-disable-next-line max-len
       const validateDataDiskSize = nodePoolConfig.value.nodeTemplate.dataDisks.every(item => item.diskSize % 10 === 0);
       if (!basicFormValidate || !result || !validateDataDiskSize) return false;
 
       return true;
     };
+    
+    const { focusOnErrorField } = useFocusOnErrorField();
     const handleNext = async () => {
-      if (!await validate()) return;
-
+      // 校验错误滚动到第一个错误的位置
+      const result = await validate();
+      if (!result) {
+        focusOnErrorField();
+        return;
+      };
       ctx.emit('next', getNodePoolData());
     };
 
@@ -746,6 +753,7 @@ export default defineComponent({
       handleCancel,
       getSchemaByProp,
       validate,
+      focusOnErrorField,
       getNodePoolData,
       CPU,
       Mem,
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/huawei/edit-node-pool.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/huawei/edit-node-pool.vue
index f75e163e73..c8976e67fe 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/huawei/edit-node-pool.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/huawei/edit-node-pool.vue
@@ -51,6 +51,7 @@ import $router from '@/router/index';
 import $store from '@/store/index';
 import { useClusterList } from '@/views/cluster-manage/cluster/use-cluster';
 import HeaderNav from '@/views/cluster-manage/components/header-nav.vue';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 
 export default defineComponent({
   components: {
@@ -130,6 +131,7 @@ export default defineComponent({
       });
       return data;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
 
     // 保存
     const user = computed(() => $store.state.user);
@@ -137,6 +139,9 @@ export default defineComponent({
     const handleEditNodePool = async () => {
       const nodePoolInfoValidate = await nodePoolInfoRef.value?.validate();
       const nodePoolConfigValidate = await nodePoolConfigRef.value?.validate();
+      if (!nodePoolConfigValidate) {
+        focusOnErrorField()
+      }
       if (!nodePoolInfoValidate || !nodePoolConfigValidate) return;
 
       saveLoading.value = true;
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/huawei/node-config.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/huawei/node-config.vue
index 29664f322f..c916f7bf67 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/huawei/node-config.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/huawei/node-config.vue
@@ -457,6 +457,7 @@ import { cloudsRuntimeInfo, cloudsZones } from '@/api/modules/cluster-manager';
 import FormGroup from '@/components/form-group.vue';
 import TextTips from '@/components/layout/TextTips.vue';
 import usePage from '@/composables/use-page';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 import $i18n from '@/i18n/i18n-setup';
 import $router from '@/router';
 import $store from '@/store/index';
@@ -1062,21 +1063,14 @@ export default defineComponent({
 
       return true;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
     const handleNext = async () => {
+      // 校验错误滚动到第一个错误的位置
       const result = await validate();
       if (!result) {
-        // 自动滚动到第一个错误的位置
-        const errDom = document.getElementsByClassName('form-error-tip');
-        const bcsErrDom = document.getElementsByClassName('error-tips');
-        const isErrDom = document.getElementsByClassName('is-error');
-        const firstErrDom = isErrDom[0] || errDom[0] || bcsErrDom[0];
-        firstErrDom?.scrollIntoView({
-          block: 'center',
-          behavior: 'smooth',
-        });
+        focusOnErrorField();
         return;
-      }
-
+      };
       ctx.emit('next', getNodePoolData());
     };
 
@@ -1153,6 +1147,7 @@ export default defineComponent({
       getSchemaByProp,
       showRepeatMountTarget,
       validate,
+      focusOnErrorField,
       handleGetRuntimeinfo,
       getNodePoolData,
       CPU,
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/internal/edit-node-pool.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/internal/edit-node-pool.vue
index bce5ce84bd..b127c44e3d 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/internal/edit-node-pool.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/internal/edit-node-pool.vue
@@ -51,6 +51,7 @@ import $router from '@/router/index';
 import $store from '@/store/index';
 import { useClusterList } from '@/views/cluster-manage/cluster/use-cluster';
 import HeaderNav from '@/views/cluster-manage/components/header-nav.vue';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 
 export default defineComponent({
   components: {
@@ -130,6 +131,7 @@ export default defineComponent({
       });
       return data;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
 
     // 保存
     const user = computed(() => $store.state.user);
@@ -137,6 +139,9 @@ export default defineComponent({
     const handleEditNodePool = async () => {
       const nodePoolInfoValidate = await nodePoolInfoRef.value?.validate();
       const nodePoolConfigValidate = await nodePoolConfigRef.value?.validate();
+      if (!nodePoolConfigValidate) {
+        focusOnErrorField()
+      }
       if (!nodePoolInfoValidate || !nodePoolConfigValidate) return;
 
       saveLoading.value = true;
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/internal/node-config.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/internal/node-config.vue
index 6c0c5b53b9..f102cda7ef 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/internal/node-config.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/internal/node-config.vue
@@ -358,6 +358,7 @@ import FormGroup from '@/components/form-group.vue';
 import TextTips from '@/components/layout/TextTips.vue';
 import { useProject } from '@/composables/use-app';
 import usePage from '@/composables/use-page';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 import $i18n from '@/i18n/i18n-setup';
 import $router from '@/router';
 import $store from '@/store/index';
@@ -760,19 +761,14 @@ export default defineComponent({
 
       return true;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
     const handleNext = async () => {
-      if (!await validate()) {
-        // 自动滚动到第一个错误的位置
-        const errDom = document.getElementsByClassName('form-error-tip');
-        const bcsErrDom = document.getElementsByClassName('error-tips');
-        const firstErrDom = errDom[0] || bcsErrDom[0];
-        firstErrDom?.scrollIntoView({
-          block: 'center',
-          behavior: 'smooth',
-        });
+      // 校验错误滚动到第一个错误的位置
+      const result = await validate();
+      if (!result) {
+        focusOnErrorField();
         return;
-      };
-
+      }
       ctx.emit('next', getNodePoolData());
     };
 
@@ -848,6 +844,7 @@ export default defineComponent({
       getSchemaByProp,
       showRepeatMountTarget,
       validate,
+      focusOnErrorField,
       getNodePoolData,
       CPU,
       Mem,
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/tencent/edit-node-pool.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/tencent/edit-node-pool.vue
index 5ddc481ae8..af7b55ab84 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/tencent/edit-node-pool.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/tencent/edit-node-pool.vue
@@ -51,6 +51,7 @@ import $router from '@/router/index';
 import $store from '@/store/index';
 import { useClusterList } from '@/views/cluster-manage/cluster/use-cluster';
 import HeaderNav from '@/views/cluster-manage/components/header-nav.vue';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 
 export default defineComponent({
   components: {
@@ -130,6 +131,7 @@ export default defineComponent({
       });
       return data;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
 
     // 保存
     const user = computed(() => $store.state.user);
@@ -137,6 +139,9 @@ export default defineComponent({
     const handleEditNodePool = async () => {
       const nodePoolInfoValidate = await nodePoolInfoRef.value?.validate();
       const nodePoolConfigValidate = await nodePoolConfigRef.value?.validate();
+      if (!nodePoolConfigValidate) {
+        focusOnErrorField()
+      }
       if (!nodePoolInfoValidate || !nodePoolConfigValidate) return;
 
       saveLoading.value = true;
diff --git a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/tencent/node-config.vue b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/tencent/node-config.vue
index d518604320..8aedc2eb33 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/autoscaler/tencent/node-config.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/autoscaler/tencent/node-config.vue
@@ -579,6 +579,7 @@ import { cloudsZones } from '@/api/modules/cluster-manager';
 import FormGroup from '@/components/form-group.vue';
 import TextTips from '@/components/layout/TextTips.vue';
 import usePage from '@/composables/use-page';
+import { useFocusOnErrorField } from '@/composables/use-focus-on-error-field';
 import $i18n from '@/i18n/i18n-setup';
 import $router from '@/router';
 import $store from '@/store/index';
@@ -1192,20 +1193,14 @@ export default defineComponent({
 
       return true;
     };
+    const { focusOnErrorField } = useFocusOnErrorField();
     const handleNext = async () => {
+      // 校验错误滚动到第一个错误的位置
       const result = await validate();
       if (!result) {
-        // 自动滚动到第一个错误的位置
-        const errDom = document.getElementsByClassName('form-error-tip');
-        const bcsErrDom = document.getElementsByClassName('error-tips');
-        const firstErrDom = errDom[0] || bcsErrDom[0];
-        firstErrDom?.scrollIntoView({
-          block: 'center',
-          behavior: 'smooth',
-        });
+        focusOnErrorField();
         return;
       }
-
       ctx.emit('next', getNodePoolData());
     };
 
@@ -1289,6 +1284,7 @@ export default defineComponent({
       getSchemaByProp,
       showRepeatMountTarget,
       validate,
+      focusOnErrorField,
       getNodePoolData,
       CPU,
       Mem,
diff --git a/bcs-ui/frontend/src/views/cluster-manage/components/bk-sops.vue b/bcs-ui/frontend/src/views/cluster-manage/components/bk-sops.vue
new file mode 100644
index 0000000000..18736a99fc
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/components/bk-sops.vue
@@ -0,0 +1,472 @@
+<template>
+  <div>
+    <div class="sops-wrapper">
+      <bcs-select
+        :loading="bkSopsLoading"
+        :clearable="false"
+        class="max-w-[524px]"
+        searchable
+        style="flex: 1"
+        v-model="bkSopsTemplateID">
+        <bcs-option
+          v-for="item in bkSopsList"
+          :key="item.templateID"
+          :id="item.templateID"
+          :name="item.templateName">
+        </bcs-option>
+      </bcs-select>
+      <span
+        class="ml10"
+        v-if="templateUrl"
+        v-bk-tooltips.top="$t('cluster.nodeTemplate.sops.tips.gotoSops')"
+        @click="handleGotoSops">
+        <i class="bcs-icon bcs-icon-fenxiang"></i>
+      </span>
+      <span
+        class="ml10"
+        v-bk-tooltips.top="$t('generic.button.refresh')"
+        @click="handleRefreshList">
+        <i class="bcs-icon bcs-icon-reset"></i>
+      </span>
+    </div>
+    <div class="bk-sops-params max-w-[600px]" v-bkloading="{ isLoading: sopsParamsLoading }">
+      <div class="title">
+        <span v-bk-tooltips.top="{ content: $t('cluster.nodeTemplate.sops.title.taskArgs.tips') }" class="name">
+          {{$t('cluster.nodeTemplate.sops.title.taskArgs.text')}}
+        </span>
+      </div>
+      <div class="content">
+        <div class="content-item mb15" v-for="item in sopsParamsList" :key="item.key">
+          <div class="content-item-label">
+            <span
+              :class="{ desc: !!item.desc }"
+              v-bk-tooltips.top="{
+                content: item.desc,
+                disabled: !item.desc
+              }"
+            >{{item.name}}</span>
+          </div>
+          <bcs-input
+            behavior="simplicity"
+            :placeholder="$t('cluster.nodeTemplate.sops.placeholder.input')"
+            v-model="sopsParams[item.key]">
+          </bcs-input>
+        </div>
+        <bcs-button
+          theme="primary"
+          outline
+          @click="handleBeforeDebug">
+          {{$t('cluster.nodeTemplate.sops.button.debug.text')}}
+        </bcs-button>
+      </div>
+    </div>
+    <!-- 任务参数 -->
+    <bcs-dialog :title="$t('cluster.nodeTemplate.sops.title.confirmInnerVar')" v-model="showTaskParams">
+      <div v-bkloading="{ isLoading: templateValuesLoading }">
+        <div
+          class="content-item mb15"
+          v-for="item in variableList"
+          :key="item.key">
+          <div class="content-item-label">
+            <span>{{item.key}}</span>
+          </div>
+          <div class="relative">
+            <bcs-input
+              behavior="simplicity"
+              :disabled="item.disabled"
+              v-model="variableParams[item.key]">
+            </bcs-input>
+            <i
+              v-if="!variableParams[item.key]"
+              v-bk-tooltips="$t('generic.validate.required')"
+              class="text-[red] absolute top-[10px] right-[5px] bk-icon icon-exclamation-circle-shape"></i>
+          </div>
+        </div>
+      </div>
+      <template #footer>
+        <div>
+          <bcs-button theme="primary" @click="handleDebug">{{ $t('generic.button.confirm1') }}</bcs-button>
+          <bcs-button @click="showTaskParams = false">{{ $t('generic.button.cancel') }}</bcs-button>
+        </div>
+      </template>
+    </bcs-dialog>
+    <!-- 任务调试状态 -->
+    <bcs-dialog
+      :show-footer="false"
+      :mask-close="false"
+      width="400"
+      v-model="showDebugStatus"
+      :on-close="handleDebugDialogClose">
+      <div class="task-status">
+        <div
+          class="loading-icon"
+          v-show="['INITIALIZING', 'RUNNING'].includes(taskData.status)"
+          v-bkloading="{
+            isLoading: ['INITIALIZING', 'RUNNING'].includes(taskData.status),
+            opacity: 1,
+            theme: 'primary',
+            mode: 'spin'
+          }"></div>
+        <template v-if="['INITIALIZING', 'RUNNING'].includes(taskData.status)">
+          <div class="title mt15">{{$t('cluster.nodeTemplate.sops.status.running.text')}}...</div>
+          <div class="operator mt15">
+            <bcs-button
+              text
+              size="small"
+              :disabled="!taskUrl"
+              @click="handleGotoTaskDetail">
+              {{$t('cluster.nodeTemplate.sops.status.running.detailBtn')}}
+            </bcs-button>
+          </div>
+        </template>
+        <template v-else-if="taskData.status === 'SUCCESS'">
+          <div class="bcs-flex-center">
+            <span class="status-icon success"><i class="bcs-icon bcs-icon-check-1"></i></span>
+          </div>
+          <div class="title mt20">{{$t('cluster.nodeTemplate.sops.status.success')}}</div>
+          <div class="operator mt20">
+            <bcs-button
+              class="mw88"
+              theme="primary"
+              :disabled="!taskUrl"
+              @click="handleGotoTaskDetail"
+            >{{$t('cluster.nodeTemplate.sops.status.running.detailBtn')}}</bcs-button>
+            <bcs-button
+              class="ml5"
+              style="min-width: 88px;"
+              @click="showDebugStatus = false">{{$t('generic.status.done')}}</bcs-button>
+          </div>
+        </template>
+        <template v-else-if="taskData.status === 'FAILURE'">
+          <div class="bcs-flex-center">
+            <span class="status-icon failure"><i class="bcs-icon bcs-icon-close"></i></span>
+          </div>
+          <div class="title mt20">{{$t('cluster.nodeTemplate.sops.status.failed.text')}}</div>
+          <div class="operator mt20">
+            <span
+              v-bk-tooltips="{
+                content: $t('cluster.nodeTemplate.sops.status.failed.tips'),
+                disabled: !!taskUrl
+              }">
+              <bcs-button
+                class="mw88"
+                theme="primary"
+                :disabled="!taskUrl"
+                @click="handleGotoTaskDetail"
+              >{{$t('cluster.nodeTemplate.sops.status.running.detailBtn')}}</bcs-button>
+            </span>
+            <bcs-button
+              class="mw88 ml5"
+              theme="primary"
+              @click="handleBeforeDebug">{{$t('cluster.nodeTemplate.sops.button.retry')}}</bcs-button>
+          </div>
+        </template>
+      </div>
+    </bcs-dialog>
+  </div>
+</template>
+<script lang="ts">
+import { computed, defineComponent, onMounted, ref, set, toRefs, watch } from 'vue';
+
+import useInterval from '@/composables/use-interval';
+import $store from '@/store/index';
+
+export default defineComponent({
+  name: 'BkSops',
+  props: {
+    addons: {
+      type: Object,
+      default: () => null,
+    },
+    actionsKey: {
+      type: String,
+      required: true,
+      default: 'preActions',
+      // validator(value: string) {
+      //   return [
+      //     'preActions',
+      //     'postActions',
+      //   ].indexOf(value) > -1;
+      // },
+    },
+    clusterId: {
+      type: String,
+      default: '',
+    },
+    allowSkipWhenFailed: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  setup(props) {
+    const { addons, actionsKey, clusterId, allowSkipWhenFailed } = toRefs(props);
+    const curProject = computed(() => $store.state.curProject);
+    const user = computed(() => $store.state.user);
+
+    const bkSopsLoading = ref(false);
+    const bkSopsList = ref<any[]>([]);
+    const bkSopsTemplateID = ref('');
+    watch(bkSopsTemplateID, () => {
+      if (!bkSopsTemplateID.value) return;
+      // 清空数据
+      sopsParams.value = {};
+      sopsParamsList.value = [];
+      handleGetSopsParams();
+    });
+    const handleGetbkSopsList = async () => {
+      bkSopsLoading.value = true;
+      bkSopsList.value = await $store.dispatch('clustermanager/bkSopsList', {
+        $businessID: curProject.value.businessID,
+        operator: user.value.username,
+        templateSource: 'business',
+        scope: 'cmdb_biz',
+      });
+      if (!bkSopsTemplateID.value) {
+        bkSopsTemplateID.value = bkSopsList.value[0]?.templateID;
+      }
+      bkSopsLoading.value = false;
+    };
+    const handleRefreshList = async () => {
+      await handleGetbkSopsList();
+      await handleGetSopsParams();
+    };
+    const sopsParamsLoading = ref(false);
+    const sopsParams = ref({});
+    const isSopsParamsExitVar = computed(() => Object.values(sopsParams.value).some(value => /{{.*}}/.test(value as string)));
+    const sopsParamsList = ref<any[]>([]);
+    const templateUrl = ref('');
+    const handleGetSopsParams = async () => {
+      sopsParamsLoading.value = true;
+      const data = await $store.dispatch('clustermanager/bkSopsParamsList', {
+        $templateID: bkSopsTemplateID.value,
+        $businessID: curProject.value.businessID,
+        operator: user.value.username,
+        templateSource: 'business',
+        scope: 'cmdb_biz',
+      });
+      sopsParamsList.value = data.values;
+      // 详情数据
+      sopsParams.value = JSON.parse(JSON.stringify(
+        addons.value?.plugins?.[bkSopsTemplateID.value]?.params
+        || data.values.reduce((pre, item) => {
+          pre[item.key] = '';
+          return pre;
+        }, {}),
+        (key, value) => {
+          if (['template_biz_id', 'template_id', 'template_user'].includes(key)) {
+            return undefined;
+          }
+          return value;
+        },
+      ));
+      templateUrl.value = data.templateUrl;
+      sopsParamsLoading.value = false;
+    };
+    const handleGotoSops = () => {
+      window.open(templateUrl.value);
+    };
+    // 调试标准运维任务
+    const showDebugStatus = ref(false);
+    const showTaskParams = ref(false);
+    const variableParams = ref({});
+    const variableList = ref<any[]>([]);
+    const templateValuesLoading = ref(false);
+    const templateValues = ref<any[]>();
+    const taskData = ref<any>({});
+    const taskUrl = computed(() => {
+      const [stepID] = taskData.value.stepSequence || [];
+      return taskData.value?.steps?.[stepID]?.params?.taskUrl;
+    });
+    const handleDebugDialogClose = () => {
+      taskData.value = {};
+      stop();
+    };
+    const handlePollTask = async () => {
+      taskData.value = await $store.dispatch('clustermanager/taskDetail', {
+        $taskId: taskData.value.taskID,
+      });
+      if (['SUCCESS', 'FAILURE'].includes(taskData.value.status)) {
+        stop();
+      }
+    };
+    const { start, stop } = useInterval(handlePollTask, 5000, true);
+    const handleBeforeDebug = async () => {
+      variableParams.value = {};
+      variableList.value = [];
+      const variable = Object.keys(sopsParams.value).filter(key => /^{{.+}}$/.test(sopsParams.value[key]));
+      if (variable.length) {
+        // 有内置变量，默认渲染
+        showTaskParams.value = true;
+        templateValuesLoading.value = true;
+        templateValues.value =  await $store.dispatch('clustermanager/bkSopsTemplatevalues', {
+          clusterID: clusterId.value,
+          operator: user.value.username,
+        });
+        templateValuesLoading.value = false;
+        variable.forEach((key) => {
+          const template = templateValues.value?.find(item => item.refer === sopsParams.value[key]);
+          set(variableParams.value, key, template?.value);
+          variableList.value.push({
+            key,
+            disabled: !!template?.value,
+          });
+        });
+        // 排序
+        variableList.value = variableList.value.sort(item => (item.disabled ? 0 : -1));
+      } else {
+        handleDebug();
+      }
+    };
+    const handleDebug = async () => {
+      // 校验数据
+      const keys = Object.keys(variableParams.value);
+      if (keys.length && keys.some(key => !variableParams.value[key])) return;
+
+      const { task } = await $store.dispatch('clustermanager/bkSopsDebug', {
+        businessID: String(curProject.value.businessID),
+        templateID: String(bkSopsTemplateID.value),
+        operator: user.value.username,
+        templateSource: 'business',
+        constant: {
+          ...sopsParams.value,
+          ...variableParams.value,
+        },
+      });
+      taskData.value = task || {};
+      if (taskData.value.taskID) {
+        showTaskParams.value = false;
+        showDebugStatus.value = true;
+        start();
+      }
+    };
+    // 跳转任务详情
+    const handleGotoTaskDetail = () => {
+      window.open(taskUrl.value);
+    };
+
+    const bkSopsData = computed(() => ({
+      [actionsKey.value]: [bkSopsTemplateID.value],
+      plugins: {
+        [bkSopsTemplateID.value]: {
+          params: {
+            template_biz_id: String(curProject.value.businessID),
+            template_id: bkSopsTemplateID.value,
+            template_user: user.value.username,
+            ...sopsParams.value,
+          },
+          allowSkipWhenFailed: allowSkipWhenFailed.value,
+        },
+      },
+    }));
+
+    onMounted(() => {
+      // eslint-disable-next-line camelcase, max-len
+      bkSopsTemplateID.value = addons.value?.plugins?.[addons.value?.[actionsKey.value]?.[0]]?.params?.template_id;
+      handleGetbkSopsList();
+    });
+
+    return {
+      variableList,
+      variableParams,
+      templateValuesLoading,
+      showTaskParams,
+      bkSopsTemplateID,
+      bkSopsLoading,
+      sopsParamsLoading,
+      sopsParamsList,
+      sopsParams,
+      templateUrl,
+      bkSopsList,
+      handleDebug,
+      showDebugStatus,
+      taskData,
+      taskUrl,
+      bkSopsData,
+      handleDebugDialogClose,
+      handleGetbkSopsList,
+      handleRefreshList,
+      isSopsParamsExitVar,
+      handleGotoSops,
+      handleGotoTaskDetail,
+      handleBeforeDebug,
+    };
+  },
+});
+</script>
+<style lang="postcss" scoped>
+.sops-wrapper {
+  display: flex;
+  align-items: center;
+  .bcs-icon {
+      color: #3a84ff;
+      cursor: pointer;
+  }
+}
+.bk-sops-params {
+  margin-top: 12px;
+  border: 1px solid #DCDEE5;
+  border-radius: 2px;
+  .title {
+      background: #F5F7FA;
+      border-bottom: 1px solid #DCDEE5;
+      height: 36px;
+      padding: 0 16px;
+      display: flex;
+      align-items: center;
+      .name {
+        border-bottom: 1px dashed #979ba5;
+        line-height: 20px;
+      }
+  }
+  .content {
+      padding: 20px 16px;
+      &-item-label {
+          padding-left: 10px;
+          line-height: 1;
+          .desc {
+              border-bottom: 1px dashed #979ba5;
+              display: inline-block;
+              padding-bottom: 2px;
+          }
+      }
+  }
+}
+.task-status {
+  .loading-icon {
+      height: 70px;
+  }
+  .title {
+      font-size: 20px;
+      color: #313238;
+      text-align: center;
+  }
+  .sub-title {
+      text-align: center;
+      font-size: 14px;
+      color: #63656E;
+  }
+  .status-icon {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      width: 42px;
+      height: 42px;
+      border-radius: 50%;
+      i {
+          font-weight: bold;
+      }
+      &.success {
+          background-color: #E5F6EA;
+          color: #3FC06D;
+      }
+      &.failure {
+          background-color: #FFDDDD;
+          color: #EA3636;
+      }
+  }
+  .operator {
+      display: flex;
+      justify-content: center;
+  }
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/components/vpc-cni.vue b/bcs-ui/frontend/src/views/cluster-manage/components/vpc-cni.vue
index 8beeb102a4..14f88a0c76 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/components/vpc-cni.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/components/vpc-cni.vue
@@ -4,20 +4,22 @@
       class="flex flex-1 items-center mb-[10px]"
       v-for="subnet, index in subnetSourceNew"
       :key="index">
-      <span
-        class="prefix"
-        v-bk-tooltips="$t('tke.tips.subnetZone')">
-        <span class="bcs-border-tips">{{ $t('tke.label.zone') }}</span>
-      </span>
-      <Zone
-        class="flex-1 ml-[-1px] mr-[8px]"
-        :region="region"
-        :cloud-account-i-d="cloudAccountID"
-        :cloud-i-d="cloudID"
-        :disabled-zone-list="getDisableZoneList(subnet.zone)"
-        :disabled-tips="$t('tke.tips.hasSelected')"
-        :init-data="index === 0"
-        v-model="subnet.zone" />
+      <template v-if="showZone">
+        <span
+          class="prefix"
+          v-bk-tooltips="$t('tke.tips.subnetZone')">
+          <span class="bcs-border-tips">{{ $t('tke.label.zone') }}</span>
+        </span>
+        <Zone
+          class="flex-1 ml-[-1px] mr-[8px]"
+          :region="region"
+          :cloud-account-i-d="cloudAccountID"
+          :cloud-i-d="cloudID"
+          :disabled-zone-list="getDisableZoneList(subnet.zone)"
+          :disabled-tips="$t('tke.tips.hasSelected')"
+          :init-data="index === 0"
+          v-model="subnet.zone" />
+      </template>
       <span class="prefix">{{ $t('tke.label.ipNum') }}</span>
       <bcs-select
         class="flex-1 ml-[-1px]"
@@ -67,6 +69,10 @@ const props = defineProps({
     type: String,
     default: '',
   },
+  showZone: {
+    type: Boolean,
+    default: true,
+  },
 });
 
 const emits = defineEmits(['change']);
diff --git a/bcs-ui/frontend/src/views/cluster-manage/detail/network/aws.vue b/bcs-ui/frontend/src/views/cluster-manage/detail/network/aws.vue
new file mode 100644
index 0000000000..fbde917b10
--- /dev/null
+++ b/bcs-ui/frontend/src/views/cluster-manage/detail/network/aws.vue
@@ -0,0 +1,100 @@
+<template>
+  <bk-form class="bcs-small-form" :label-width="160" v-bkloading="{ isLoading }">
+    <DescList :title="$t('generic.label.basicConfig')">
+      <bk-form-item :label="$t('cluster.labels.region')">
+        <LoadingIcon v-if="regionLoading">{{ $t('generic.status.loading') }}...</LoadingIcon>
+        <span v-else>{{ region }}</span>
+      </bk-form-item>
+      <bk-form-item :label="$t('cluster.create.label.privateNet.text')">
+        <LoadingIcon v-if="vpcLoading">{{ $t('generic.status.loading') }}...</LoadingIcon>
+        <span v-else>{{ vpc || '--' }}</span>
+      </bk-form-item>
+      <bk-form-item :label="$t('cluster.labels.networkType')">
+        {{ networkType }}
+      </bk-form-item>
+    </DescList>
+    <DescList class="mt-[16px]" :title="$t('k8s.containerNetwork')">
+      <!-- 底层网络插件: VPC-CNI模式 -->
+      <bk-form-item
+        :label="$t('cluster.create.label.networkSetting.maxServiceNum.text')">
+        {{ maxServiceNum }}
+      </bk-form-item>
+      <bk-form-item
+        :label="$t('tke.label.serviceCidr')">
+        {{ clusterData.networkSettings &&clusterData.networkSettings.serviceIPv4CIDR
+          ? clusterData.networkSettings.serviceIPv4CIDR : '--' }}
+      </bk-form-item>
+    </DescList>
+  </bk-form>
+</template>
+<script lang="ts" setup>
+import { computed, onMounted } from 'vue';
+
+import DescList from '@/components/desc-list.vue';
+import LoadingIcon from '@/components/loading-icon.vue';
+import { useClusterInfo } from '@/views/cluster-manage/cluster/use-cluster';
+import useCloud from '@/views/cluster-manage/use-cloud';
+
+const props = defineProps({
+  clusterId: {
+    type: String,
+    required: true,
+  },
+});
+
+const { clusterData, isLoading, getClusterDetail } = useClusterInfo();
+
+// service网段 IP数量
+const maxServiceNum = computed(() => clusterData.value?.networkSettings?.maxServiceNum || 0);
+
+// 网络插件类型
+const netTypeMap = {
+  GR: 'Global Router',
+};
+const networkType = computed(() => {
+  const type = clusterData.value?.clusterAdvanceSettings?.networkType;
+  return type
+    ? `${netTypeMap[type] || type}(${clusterData.value.networkType})`
+    : '--';
+});
+
+// 可用区 和 vpc
+const {
+  regionLoading,
+  regionList,
+  handleGetRegionList,
+  vpcList,
+  vpcLoading,
+  handleGetVPCList,
+} = useCloud();
+
+const region = computed(() => {
+  const data = regionList.value.find(item => item.region === clusterData.value.region);
+  return data ? `${data.regionName}(${data.region})` : clusterData.value.region;
+});
+const vpc = computed(() => {
+  const data = vpcList.value.find(item => item.vpcId === clusterData.value.vpcID);
+  return data ? `${data.name}(${data.vpcId})` : (clusterData.value.vpcID || '--');
+});
+
+onMounted(async () => {
+  await getClusterDetail(props.clusterId, true);
+  await Promise.all([
+    handleGetRegionList({
+      cloudAccountID: clusterData.value.cloudAccountID,
+      cloudID: clusterData.value.provider,
+    }),
+    handleGetVPCList({
+      region: clusterData.value.region,
+      cloudAccountID: clusterData.value.cloudAccountID,
+      cloudID: clusterData.value.provider,
+      resourceGroupName: clusterData.value.extraInfo?.nodeResourceGroup,
+    }),
+  ]);
+});
+</script>
+<style lang="postcss" scoped>
+>>> .bk-table .cell {
+  padding-left: 15px !important;
+}
+</style>
diff --git a/bcs-ui/frontend/src/views/cluster-manage/detail/network/index.vue b/bcs-ui/frontend/src/views/cluster-manage/detail/network/index.vue
index dcf17253b9..97cf246be0 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/detail/network/index.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/detail/network/index.vue
@@ -4,6 +4,7 @@
 <script lang="ts">
 import { Component, computed, defineComponent } from 'vue';
 
+import awsNet from './aws.vue';
 import azureNet from './azure.vue';
 import bluekingNet from './blueking.vue';
 import gcpNet from './gcp.vue';
@@ -33,7 +34,7 @@ export default defineComponent({
       bluekingCloud: bluekingNet,
       azureCloud: azureNet,
       huaweiCloud: bluekingNet,
-      awsCloud: bluekingNet,
+      awsCloud: awsNet,
     };
     return {
       provider,
diff --git a/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue b/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue
index 16d0796ab6..f007dbb50d 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue
+++ b/bcs-ui/frontend/src/views/cluster-manage/node-list/node.vue
@@ -8,7 +8,7 @@
     <bcs-alert type="info" class="cluster-node-tip">
       <div slot="title">
         {{$t('cluster.nodeList.article1')}}
-        <i18n path="cluster.nodeList.article2">
+        <i18n v-if="clusterData.provider !== 'awsCloud'" path="cluster.nodeList.article2">
           <span place="nodes" class="num">{{ clusterData.extraInfo?.clusterCurNodeNum || '--' }}</span>
           <span place="realRemainNodesCount" class="num">{{ clusterData.extraInfo?.clusterSupNodeNum || '--' }}</span>
         </i18n>
@@ -376,7 +376,9 @@
           v-if="isColumnRender('container_count')">
           <template #default="{ row }">
             <template v-if="['RUNNING', 'REMOVABLE'].includes(row.status)">
-              <LoadingIcon v-if="!nodeMetric[row.nodeName]" class="justify-end" />
+              <LoadingIcon v-if="!nodeMetric[row.nodeName]" class="justify-end">
+                {{ `${$t('generic.status.loading')}...` }}
+              </LoadingIcon>
               <span v-else>
                 {{nodeMetric[row.nodeName].container_count || '--'}}
               </span>
@@ -394,7 +396,9 @@
           v-if="isColumnRender('pod_count')">
           <template #default="{ row }">
             <template v-if="['RUNNING', 'REMOVABLE'].includes(row.status)">
-              <LoadingIcon v-if="!nodeMetric[row.nodeName]" class="justify-end" />
+              <LoadingIcon v-if="!nodeMetric[row.nodeName]" class="justify-end">
+                {{ `${$t('generic.status.loading')}...` }}
+              </LoadingIcon>
               <span v-else>
                 {{nodeMetric[row.nodeName].pod_count || '--'}}
               </span>
@@ -478,7 +482,9 @@
           min-width="120">
           <template #default="{ row }">
             <template v-if="['RUNNING', 'REMOVABLE'].includes(row.status)">
-              <LoadingIcon v-if="!nodeMetric[row.nodeName]" class="justify-center" />
+              <LoadingIcon v-if="!nodeMetric[row.nodeName]" class="justify-center">
+                {{ `${$t('generic.status.loading')}...` }}
+              </LoadingIcon>
               <template v-else>
                 <RingCell
                   :percent="nodeMetric[row.nodeName][item.prop]"
diff --git a/bcs-ui/frontend/src/views/cluster-manage/use-cloud.ts b/bcs-ui/frontend/src/views/cluster-manage/use-cloud.ts
index fa027f7cca..146f81d810 100644
--- a/bcs-ui/frontend/src/views/cluster-manage/use-cloud.ts
+++ b/bcs-ui/frontend/src/views/cluster-manage/use-cloud.ts
@@ -3,6 +3,7 @@ import { computed, ref } from 'vue';
 import {
   cloudAccounts as cloudAccountsAPI,
   cloudRegionByAccount,
+  cloudRoles,
   cloudSecurityGroups,
   cloudVPC,
   clusterConnect as clusterConnectAPI,
@@ -10,8 +11,7 @@ import {
   deleteCloudAccounts as deleteCloudAccountsAPI,
   nodemanCloud,
   updateCloudAccounts as updateCloudAccountsAPI,
-  validateCloudAccounts as validateCloudAccountsAPI,
-} from '@/api/modules/cluster-manager';
+  validateCloudAccounts as validateCloudAccountsAPI } from '@/api/modules/cluster-manager';
 import $i18n from '@/i18n/i18n-setup';
 import $store from '@/store';
 import { ICloudRegion, INodeManCloud, ISecurityGroup, IVpcItem } from '@/views/cluster-manage/types/types';
@@ -58,6 +58,13 @@ export interface ICloudAccount {
   clusters: string
 }
 
+export interface ICloudRole {
+  roleName: string;
+  roleID: string;
+  arn: string;
+  description: string;
+}
+
 export default function () {
   const curProject = computed(() => $store.state.curProject);
   const user = computed(() => $store.state.user);
@@ -114,6 +121,18 @@ export default function () {
       }
     };
   };
+  // 角色列表
+  async function getCloudRolesList($cloudId: CloudID|undefined, accountID, roleType) {
+    if (!$cloudId) return { data: [] };
+    const res = await cloudRoles({
+      $cloudId,
+      accountID,
+      roleType,
+    }, { needRes: true }).catch(() => []);
+    return res as {
+      data: ICloudRole[]
+    };
+  }
   // 创建云账号
   const createCloudAccounts = async <T = IGoogleAccount>(params: ICreateAccountParams<T>) => {
     const result = await createCloudAccountsAPI({
@@ -250,5 +269,6 @@ export default function () {
     securityGroups,
     handleGetSecurityGroups,
     providerNameMap,
+    getCloudRolesList,
   };
 }
diff --git a/bcs-ui/frontend/src/views/deploy-manage/helm/release-chart.vue b/bcs-ui/frontend/src/views/deploy-manage/helm/release-chart.vue
index ca9c13d8b0..90840a3e1b 100644
--- a/bcs-ui/frontend/src/views/deploy-manage/helm/release-chart.vue
+++ b/bcs-ui/frontend/src/views/deploy-manage/helm/release-chart.vue
@@ -1,175 +1,119 @@
 <!-- eslint-disable max-len -->
 <template>
-  <BcsContent :title="isEdit ? releaseName : $t('deploy.helm.chartInstall')" v-bkloading="{ isLoading }" ref="contentRef">
+  <BcsContent :title="isEdit ? releaseName : $t('deploy.helm.chartInstall')" v-bkloading="{ isLoading }"
+    ref="contentRef">
     <!-- 基本信息 -->
     <div class="bcs-border min-h-[320px] bg-[#fff] flex">
       <div class="w-[400px] border-right flex flex-col items-center justify-center">
         <span class="text-[100px] text-[#979ba5]"><i class="bcs-icon bcs-icon-helm-app"></i></span>
-        <span class="text-[#333c48] text-[14px] font-bold">{{chartName}}</span>
-        <div
-          class="text-[12px] text-[#b2b5bd] mt-[8px] mb-[4px] px-[20px] text-ellipsis">
-          {{chartData.latestDescription}}
+        <span class="text-[#333c48] text-[14px] font-bold">{{ chartName }}</span>
+        <div class="text-[12px] text-[#b2b5bd] mt-[8px] mb-[4px] px-[20px] text-ellipsis">
+          {{ chartData.latestDescription }}
         </div>
-        <bcs-popconfirm
-          trigger="click"
-          :confirm-text="$t('cluster.nodeList.button.copy.text')"
-          v-if="isEdit"
-          :disabled="!releaseDetail.notes"
-          @confirm="handleCopyNotes">
-          <bcs-button text size="small" :disabled="!releaseDetail.notes">{{$t('deploy.helm.showNotes')}}</bcs-button>
+        <bcs-popconfirm trigger="click" :confirm-text="$t('cluster.nodeList.button.copy.text')" v-if="isEdit"
+          :disabled="!releaseDetail.notes" @confirm="handleCopyNotes">
+          <bcs-button text size="small" :disabled="!releaseDetail.notes">{{ $t('deploy.helm.showNotes') }}</bcs-button>
           <template #content>
-            <pre class="break-words whitespace-pre-wrap">{{releaseDetail.notes}}</pre>
+            <pre class="break-words whitespace-pre-wrap">{{ releaseDetail.notes }}</pre>
           </template>
         </bcs-popconfirm>
       </div>
       <div class="flex-1">
-        <div class="px-[20px] h-[40px] flex items-center text-[14px] border-bottom">{{$t('deploy.helm.args')}}</div>
+        <div class="px-[20px] h-[40px] flex items-center text-[14px] border-bottom">{{ $t('deploy.helm.args') }}</div>
         <!-- form组件实现强依赖 bk-form 名称 -->
-        <bk-form
-          form-type="vertical"
-          class="px-[20px] py-[14px] grid grid-cols-2 gap-[20px] max-w-[800px]"
-          :model="releaseData"
-          :rules="rules"
-          ref="formRef">
+        <bk-form form-type="vertical" class="px-[20px] py-[14px] grid grid-cols-2 gap-[20px] max-w-[800px]"
+          :model="releaseData" :rules="rules" ref="formRef">
           <bk-form-item :label="$t('generic.label.name')" required property="name" error-display-type="normal">
             <bcs-input :maxlength="53" :disabled="isEdit" v-model="releaseData.name"></bcs-input>
           </bk-form-item>
-          <bk-form-item :label="$t('generic.label.version')" required property="chartVersion" error-display-type="normal">
+          <bk-form-item :label="$t('generic.label.version')" required property="chartVersion"
+            error-display-type="normal">
             <div class="flex items-center">
-              <bcs-select
-                class="flex-1"
-                :loading="versionLoading"
-                searchable
-                :clearable="false"
+              <bcs-select class="flex-1" :loading="versionLoading" searchable :clearable="false"
                 v-model="releaseData.chartVersion">
-                <bcs-option
-                  v-for="item in versionList"
-                  :key="item.version"
-                  :id="item.version"
-                  :name="item.version">
+                <bcs-option v-for="item in versionList" :key="item.version" :id="item.version" :name="item.version">
                 </bcs-option>
               </bcs-select>
-              <span
-                class="bcs-icon-btn flex items-center justify-center w-[32px] h-[32px] ml-[-1px]"
-                style="border: 1px solid #c4c6cc"
-                v-bk-tooltips="$t('generic.button.refresh')"
+              <span class="bcs-icon-btn flex items-center justify-center w-[32px] h-[32px] ml-[-1px]"
+                style="border: 1px solid #c4c6cc" v-bk-tooltips="$t('generic.button.refresh')"
                 @click="handleGetVersionList">
                 <i class="bcs-icon bcs-icon-reset"></i>
               </span>
             </div>
           </bk-form-item>
           <bk-form-item :label="$t('generic.label.cluster1')" required property="clusterID" error-display-type="normal">
-            <ClusterSelect
-              :disabled="isEdit"
-              searchable
-              cluster-type="all"
-              class="!w-[auto]"
-              v-model="clusterID">
+            <ClusterSelect :disabled="isEdit" searchable cluster-type="all" class="!w-[auto]" v-model="clusterID">
             </ClusterSelect>
           </bk-form-item>
-          <bk-form-item
-            :label="$t('k8s.namespace')"
-            :desc="$t('deploy.helm.chartNSTips')"
-            desc-type="icon"
-            required
-            property="namespace"
-            error-display-type="normal">
-            <NamespaceSelect
-              :disabled="isEdit"
-              :cluster-id="clusterID"
-              :clearable="false"
+          <bk-form-item :label="$t('k8s.namespace')" :desc="$t('deploy.helm.chartNSTips')" desc-type="icon" required
+            property="namespace" error-display-type="normal">
+            <NamespaceSelect :disabled="isEdit" :cluster-id="clusterID" :clearable="false"
               v-model="releaseData.namespace">
             </NamespaceSelect>
           </bk-form-item>
-          <bk-form-item
-            :label="$t('deploy.helm.upgradeDesc')"
-            property="description"
-            required
-            error-display-type="normal"
-            v-if="releaseName">
+          <bk-form-item :label="$t('deploy.helm.upgradeDesc')" property="description" required
+            error-display-type="normal" v-if="releaseName">
             <bcs-input type="textarea" v-model="args['--description']"></bcs-input>
           </bk-form-item>
         </bk-form>
       </div>
     </div>
     <!-- Values信息 -->
-    <bcs-tab
-      class="mt-[20px]"
-      :active.sync="activeTab"
-      v-bkloading="{ isLoading: versionDetailLoading }"
+    <bcs-tab class="mt-[20px]" :active.sync="activeTab" v-bkloading="{ isLoading: versionDetailLoading }"
       v-if="showTab">
       <bcs-tab-panel name="values" :label="$t('deploy.helm.chartFlags')">
-        <bcs-alert
-          class="mb-[10px]"
-          type="info"
-          :title="$t('deploy.helm.defaultDesc')">
+        <bcs-alert class="mb-[10px]" type="info" :title="$t('deploy.helm.defaultDesc')">
         </bcs-alert>
         <div class="flex items-center bcs-border h-[64px] bg-[#f9fbfd] px-[16px]">
           <template v-if="!isEdit || !lockValues">
-            <span class="text-[14px]">{{$t('deploy.helm.valuesFile')}}:</span>
-            <bcs-select
-              class="w-[360px] bg-[#fff] ml-[10px]"
-              :clearable="false"
-              searchable
+            <span class="text-[14px]">{{ $t('deploy.helm.valuesFile') }}:</span>
+            <bcs-select class="w-[360px] bg-[#fff] ml-[10px]" :clearable="false" searchable
               v-model="valuesData.valueFile">
-              <bcs-option
-                v-for="item in valuesFileList"
-                :key="item"
-                :id="item"
-                :name="item">
+              <bcs-option v-for="item in valuesFileList" :key="item" :id="item" :name="item">
               </bcs-option>
             </bcs-select>
-            <span
-              class="ml-[5px] mr-[10px]"
-              v-bk-tooltips="$t('deploy.helm.values')">
+            <span class="ml-[5px] mr-[10px]" v-bk-tooltips="$t('deploy.helm.values')">
               <i class="bk-icon icon-question-circle"></i>
             </span>
           </template>
           <bcs-checkbox v-model="lockValues" class="flex flex-1 release-chart-lock-checkbox" v-if="isEdit">
-            <div
-              class="flex"
+            <div class="flex"
               :title="$t('deploy.helm.defaultLockedValuesContent', { version: releaseDetail.chartVersion })">
-              {{lockValues ? $t('deploy.helm.locked') : $t('deploy.helm.unlocked')}}
-              <i18n
-                path="deploy.helm.defaultLockedValuesContent"
+              {{ lockValues ? $t('deploy.helm.locked') : $t('deploy.helm.unlocked') }}
+              <i18n path="deploy.helm.defaultLockedValuesContent"
                 class="flex-1 text-[#979ba5] text-[12px] bcs-ellipsis">
-                <span place="version">{{releaseDetail.chartVersion}}</span>
+                <span place="version">{{ releaseDetail.chartVersion }}</span>
               </i18n>
             </div>
           </bcs-checkbox>
         </div>
-        <CodeEditor
-          ref="codeEditorRef"
-          class="code-editor"
-          full-screen
-          v-model="valuesData.valueFileContent">
-        </CodeEditor>
+        <AiEditor :value="valuesData.valueFileContent" :multi-document="false" :height="'h-[600px]'" ref="AiEditorRef" />
       </bcs-tab-panel>
       <bcs-tab-panel name="params" :label="$t('deploy.helm.helmFlags')">
         <div class="flex flex-col">
           <bcs-checkbox false-value="false" true-value="true" v-model="args['--skip-crds']">
-            {{$t('deploy.helm.skipCrds')}}
+            {{ $t('deploy.helm.skipCrds') }}
             <span class="bcs-icon-btn" v-bk-tooltips="'--skip-crds'">
               <i class="bcs-icon bcs-icon-info-circle"></i>
             </span>
           </bcs-checkbox>
           <bcs-checkbox false-value="false" true-value="true" class="mt-[10px]" v-model="args['--wait-for-jobs']">
-            {{$t('deploy.helm.waitforJobs')}}
+            {{ $t('deploy.helm.waitforJobs') }}
             <span class="bcs-icon-btn" v-bk-tooltips="'--wait-for-jobs'">
               <i class="bcs-icon bcs-icon-info-circle"></i>
             </span>
           </bcs-checkbox>
           <bcs-checkbox false-value="false" true-value="true" class="mt-[10px]" v-model="args['--wait']">
-            {{$t('deploy.helm.wait')}}
+            {{ $t('deploy.helm.wait') }}
             <span class="bcs-icon-btn" v-bk-tooltips="'--wait'">
               <i class="bcs-icon bcs-icon-info-circle"></i>
             </span>
           </bcs-checkbox>
           <div class="flex items-center text-[14px] mt-[10px]">
-            {{$t('deploy.helm.timeout')}}
+            {{ $t('deploy.helm.timeout') }}
             <bcs-input type="number" class="w-[200px] ml-[5px]" v-model="args['--timeout']">
               <template #append>
-                <div class="group-text">{{$t('units.suffix.seconds')}}</div>
+                <div class="group-text">{{ $t('units.suffix.seconds') }}</div>
               </template>
             </bcs-input>
             <span class="bcs-icon-btn ml-[5px]" v-bk-tooltips="'--timeout'">
@@ -177,15 +121,10 @@
             </span>
           </div>
           <div v-if="isEdit" class="flex items-center text-[14px] mt-[10px]">
-            {{$t('deploy.helm.hisotryMax.label')}}
-            <bcs-input
-              type="number"
-              :min="1"
-              :max="100"
-              class="w-[150px] ml-[5px]"
-              v-model="args['--history-max']">
+            {{ $t('deploy.helm.hisotryMax.label') }}
+            <bcs-input type="number" :min="1" :max="100" class="w-[150px] ml-[5px]" v-model="args['--history-max']">
               <template #append>
-                <div class="group-text">{{$t('units.suffix.units')}}</div>
+                <div class="group-text">{{ $t('units.suffix.units') }}</div>
               </template>
             </bcs-input>
             <span class="bcs-icon-btn ml-[5px]" v-bk-tooltips="$t('deploy.helm.hisotryMax.desc')">
@@ -195,111 +134,69 @@
           <!-- 自定义参数 -->
           <div class="mt-[10px]">
             <bcs-button text size="small" class="!pl-[0px]" @click="showCustomArgs = !showCustomArgs">
-              {{$t('deploy.helm.flags.label')}}
+              {{ $t('deploy.helm.flags.label') }}
               <i :class="['bcs-icon', showCustomArgs ? 'bcs-icon-angle-double-up' : 'bcs-icon-angle-double-down']"></i>
             </bcs-button>
             <span class="bcs-icon-btn" v-bk-tooltips="$t('deploy.helm.flags.desc')">
               <i class="bcs-icon bcs-icon-info-circle"></i>
             </span>
-            <KeyValue
-              v-show="showCustomArgs"
-              class="mt-[5px] max-w-[600px]"
-              :show-header="false"
-              :show-footer="false"
+            <KeyValue v-show="showCustomArgs" class="mt-[5px] max-w-[600px]" :show-header="false" :show-footer="false"
               :key-rules="[{
-                message: $t('deploy.helm.keyTips'),
-                validator: '^--'
-              }]"
-              :model-value="customArgs"
-              :min-items="0"
-              :unique-key="false"
-              key-required
-              ref="keyValueRef">
+    message: $t('deploy.helm.keyTips'),
+    validator: '^--'
+  }]" :model-value="customArgs" :min-items="0" :unique-key="false" key-required ref="keyValueRef">
             </KeyValue>
           </div>
         </div>
       </bcs-tab-panel>
     </bcs-tab>
     <!-- 预览 -->
-    <bcs-sideslider
-      :is-show.sync="showPreview"
-      quick-close
-      :width="1000"
-      :title="$t('generic.title.preview')"
+    <bcs-sideslider :is-show.sync="showPreview" quick-close :width="1000" :title="$t('generic.title.preview')"
       @hidden="isPreview = false">
       <template #content>
-        <ChartFileTree
-          :contents="previewData.newContents"
-          v-bkloading="{ isLoading: previewLoading }"
-          class="bcs-sideslider-content"
-          style="height: calc(100vh - 100px)"
-        />
+        <ChartFileTree :contents="previewData.newContents" v-bkloading="{ isLoading: previewLoading }"
+          class="bcs-sideslider-content" style="height: calc(100vh - 100px)" />
       </template>
     </bcs-sideslider>
     <!-- diff -->
-    <bcs-dialog
-      v-model="showDiffDialog"
-      :mask-close="false"
-      :width="1200">
-      <bcs-alert
-        class="mb-[10px]"
-        type="info"
-        :title="$t('deploy.helm.flagsChange')">
+    <bcs-dialog v-model="showDiffDialog" :mask-close="false" :width="1200">
+      <bcs-alert class="mb-[10px]" type="info" :title="$t('deploy.helm.flagsChange')">
       </bcs-alert>
       <div class="flex mb-[5px]">
-        <span class="flex-1">{{$t('generic.title.curVersion')}}: {{releaseDetail.chartVersion}}</span>
-        <span class="flex-1">{{$t('deploy.helm.upgrade')}}: {{releaseData.chartVersion}}</span>
+        <span class="flex-1">{{ $t('generic.title.curVersion') }}: {{ releaseDetail.chartVersion }}</span>
+        <span class="flex-1">{{ $t('deploy.helm.upgrade') }}: {{ releaseData.chartVersion }}</span>
       </div>
-      <CodeEditor
-        v-bkloading="{ isLoading: confirmLoading }"
-        diff-editor
-        full-screen
-        :value="previewData.newContent"
-        :original="previewData.oldContent"
-        class="grid !min-h-[460px]"
-        readonly>
+      <CodeEditor v-bkloading="{ isLoading: confirmLoading }" diff-editor full-screen :value="previewData.newContent"
+        :original="previewData.oldContent" class="grid !min-h-[460px]" readonly>
       </CodeEditor>
       <template #footer>
-        <bcs-button
-          theme="primary"
-          :disabled="!Object.keys(previewData).length"
-          :loading="confirmLoading"
-          @click="handleConfirmUpdate">{{$t('generic.button.confirm')}}</bcs-button>
-        <bcs-button :disabled="confirmLoading" @click="showDiffDialog = false">{{$t('generic.button.cancel')}}</bcs-button>
+        <bcs-button theme="primary" :disabled="!Object.keys(previewData).length" :loading="confirmLoading"
+          @click="handleConfirmUpdate">{{ $t('generic.button.confirm') }}</bcs-button>
+        <bcs-button :disabled="confirmLoading"
+          @click="showDiffDialog = false">{{ $t('generic.button.cancel') }}</bcs-button>
       </template>
     </bcs-dialog>
     <!-- 操作 -->
     <div class="mt-[20px]">
-      <bcs-button
-        theme="primary"
-        :loading="releaseLoading"
-        :disabled="releaseLoading"
-        v-authority="{
-          clickable: !isEdit,
-          actionId: 'namespace_scoped_update',
-          resourceName: releaseData.namespace,
-          disablePerms: !isEdit,
-          permCtx: {
-            resource_type: 'namespace',
-            project_id: projectID,
-            cluster_id: clusterID,
-            name: releaseData.namespace
-          }
-        }"
-        @click="handleReleaseOrUpdateChart">
-        {{isEdit ? $t('generic.button.update') : $t('deploy.helm.install')}}
+      <bcs-button theme="primary" :loading="releaseLoading" :disabled="releaseLoading" v-authority="{
+    clickable: !isEdit,
+    actionId: 'namespace_scoped_update',
+    resourceName: releaseData.namespace,
+    disablePerms: !isEdit,
+    permCtx: {
+      resource_type: 'namespace',
+      project_id: projectID,
+      cluster_id: clusterID,
+      name: releaseData.namespace
+    }
+  }" @click="handleReleaseOrUpdateChart">
+        {{ isEdit ? $t('generic.button.update') : $t('deploy.helm.install') }}
       </bcs-button>
-      <bcs-button
-        :loading="releaseLoading"
-        :disabled="releaseLoading"
-        @click="handleShowPreview">
-        {{$t('generic.title.preview')}}
+      <bcs-button :loading="releaseLoading" :disabled="releaseLoading" @click="handleShowPreview">
+        {{ $t('generic.title.preview') }}
       </bcs-button>
-      <bcs-button
-        :loading="releaseLoading"
-        :disabled="releaseLoading"
-        @click="handleBack">
-        {{$t('generic.button.cancel')}}
+      <bcs-button :loading="releaseLoading" :disabled="releaseLoading" @click="handleBack">
+        {{ $t('generic.button.cancel') }}
       </bcs-button>
     </div>
   </BcsContent>
@@ -316,6 +213,7 @@ import ClusterSelect from '@/components/cluster-selector/cluster-select.vue';
 import KeyValue, { IData } from '@/components/key-value.vue';
 import BcsContent from '@/components/layout/Content.vue';
 import CodeEditor from '@/components/monaco-editor/new-editor.vue';
+import AiEditor from '@/components/monaco-editor/ai-editor.vue';
 import NamespaceSelect from '@/components/namespace-selector/namespace-select.vue';
 import { useCluster, useProject } from '@/composables/use-app';
 import $i18n from '@/i18n/i18n-setup';
@@ -330,6 +228,7 @@ export default defineComponent({
     ChartFileTree,
     NamespaceSelect,
     KeyValue,
+    AiEditor,
   },
   props: {
     cluster: {
@@ -467,7 +366,6 @@ export default defineComponent({
     const showCustomArgs = ref(false);
     const formRef = ref<any>(null);
     const keyValueRef = ref<any>(null);
-    const codeEditorRef = ref<any>(null);
     const versionList = ref<any[]>([]);
     const versionDetail = ref<Record<string, any>>({});
     const valuesFileList = computed(() => versionDetail.value?.valuesFile || []);
@@ -480,12 +378,16 @@ export default defineComponent({
       args.value['--history-max'] = 10;
     }
 
+    // 获取表单数据
+    const AiEditorRef = ref<InstanceType<typeof AiEditor>>();
+
     // 表单是否修改
     const isFormChanged = ref(false);
     watch(
       () => [
         releaseData.value,
         valuesData.value,
+        AiEditorRef.value?.content
       ],
       () => {
         isFormChanged.value = true;
@@ -504,7 +406,6 @@ export default defineComponent({
         content = versionDetail.value?.contents?.[valuesData.value.valueFile]?.content || '';
       }
       valuesData.value.valueFileContent = content;
-      codeEditorRef.value?.setValue(valuesData.value.valueFileContent);
       isFormChanged.value = false;
     };
     // 锁定当前values
@@ -560,6 +461,9 @@ export default defineComponent({
     };
     // 获取提交参数
     const handleGetReleaseParams = () => {
+      if(AiEditorRef.value?.content) {
+        valuesData.value.valueFileContent = AiEditorRef.value?.content;
+      }
       const { namespace, name, chartVersion } = releaseData.value;
       const { valueFileContent, valueFile } = valuesData.value;
       // 处理command参数信息
@@ -665,7 +569,7 @@ export default defineComponent({
         chartVersion,
         namespace: ns,
         args: commands = [],
-      } =  releaseDetail.value;
+      } = releaseDetail.value;
       // 转换详情数据结构
       // 基本数据
       releaseData.value = {
@@ -720,6 +624,7 @@ export default defineComponent({
     return {
       isFormChanged,
       contentRef,
+      AiEditorRef,
       isPreview,
       activeTab,
       isLoading,
@@ -732,7 +637,6 @@ export default defineComponent({
       args,
       customArgs,
       showCustomArgs,
-      codeEditorRef,
       formRef,
       keyValueRef,
       showTab,
@@ -764,16 +668,20 @@ export default defineComponent({
 .border-right {
   border-right: 1px solid #dfe0e5;
 }
+
 .border-bottom {
   border-bottom: 1px solid #dfe0e5;
 }
+
 .code-editor {
   min-height: 600px;
 }
->>> .bk-form.bk-form-vertical .bk-form-item+.bk-form-item {
+
+>>>.bk-form.bk-form-vertical .bk-form-item+.bk-form-item {
   margin-top: 0px;
 }
->>> .release-chart-lock-checkbox .bk-checkbox-text {
+
+>>>.release-chart-lock-checkbox .bk-checkbox-text {
   flex: 1;
 }
 </style>
diff --git a/bcs-ui/frontend/src/views/deploy-manage/template-file/add-templatefile-version.vue b/bcs-ui/frontend/src/views/deploy-manage/template-file/add-templatefile-version.vue
index 07ac54d2a3..4c18aa01bf 100644
--- a/bcs-ui/frontend/src/views/deploy-manage/template-file/add-templatefile-version.vue
+++ b/bcs-ui/frontend/src/views/deploy-manage/template-file/add-templatefile-version.vue
@@ -307,7 +307,7 @@ async function createTemplateVersion(versionData: { version: string; versionDesc
       params: {
         templateSpace: fileMetadata.value.templateSpaceID,
         id: props.id,
-        isChanged: 'false',
+        isChanged: 'false', // 主动保存的不触发离开界面的二次确认逻辑
       },
       query: {
         versionID: result?.id,
diff --git a/bcs-ui/frontend/src/views/deploy-manage/template-file/file-detail.vue b/bcs-ui/frontend/src/views/deploy-manage/template-file/file-detail.vue
index 6da135c873..2636e44c31 100644
--- a/bcs-ui/frontend/src/views/deploy-manage/template-file/file-detail.vue
+++ b/bcs-ui/frontend/src/views/deploy-manage/template-file/file-detail.vue
@@ -75,7 +75,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { computed, onBeforeMount, ref, watch } from 'vue';
+import { computed, onActivated, onBeforeMount, ref, watch } from 'vue';
 
 import FileMetadataDialog from './file-metadata.vue';
 import FormMode from './form-mode.vue';
@@ -232,4 +232,8 @@ onBeforeMount(() => {
   getTemplateMetadata();
   listTemplateVersion();
 });
+
+onActivated(() => {
+  listTemplateVersion();
+});
 </script>
diff --git a/bcs-ui/frontend/src/views/project-manage/project/project.vue b/bcs-ui/frontend/src/views/project-manage/project/project.vue
index ffe7e245f0..4bd04d4f21 100644
--- a/bcs-ui/frontend/src/views/project-manage/project/project.vue
+++ b/bcs-ui/frontend/src/views/project-manage/project/project.vue
@@ -92,6 +92,7 @@ import ProjectCreate from './project-create.vue';
 import useProjects from './use-project';
 
 import { bus } from '@/common/bus';
+import { IProject } from '@/composables/use-app';
 import useDebouncedRef from '@/composables/use-debounce';
 import $router from '@/router';
 
@@ -101,16 +102,16 @@ export default defineComponent({
     ProjectCreate,
   },
   setup: () => {
-    const { getAllProjectList } = useProjects();
+    const { getProjectList } = useProjects();
     const pagination = ref({
       current: 1,
       count: 0,
       limit: 20,
     });
-    const projectList = ref<any[]>([]);
+    const projectList = ref<IProject[]>([]);
     const keyword = useDebouncedRef<string>('', 300);
     const showCreateDialog = ref(false);
-    const curProjectData = ref<any>(null);
+    const curProjectData = ref<IProject>();
     const handleGotoProject = (row) => {
       $router.push({
         name: 'clusterMain',
@@ -130,7 +131,7 @@ export default defineComponent({
       showCreateDialog.value = true;
     };
     const handleCreateProject = () => {
-      curProjectData.value = null;
+      curProjectData.value = undefined;
       showCreateDialog.value = true;
     };
     const handlePageChange = (page) => {
@@ -146,14 +147,14 @@ export default defineComponent({
     const webAnnotations = ref({ perms: {} });
     const handleGetProjectList = async () => {
       isLoading.value = true;
-      const { data = [], web_annotations: webPerms, total } = await getAllProjectList({
-        searchName: keyword.value,
+      const { data, web_annotations: webPerms } = await getProjectList({
+        searchKey: keyword.value,
         offset: pagination.value.current - 1,
         limit: pagination.value.limit,
       });
-      projectList.value = data;
+      projectList.value = data.results;
       webAnnotations.value = webPerms;
-      pagination.value.count = total;
+      pagination.value.count = data.total;
       isLoading.value = false;
     };
 
diff --git a/bcs-ui/frontend/src/views/project-manage/project/use-project.ts b/bcs-ui/frontend/src/views/project-manage/project/use-project.ts
index 07dbe97765..a89e0238e4 100644
--- a/bcs-ui/frontend/src/views/project-manage/project/use-project.ts
+++ b/bcs-ui/frontend/src/views/project-manage/project/use-project.ts
@@ -2,7 +2,6 @@ import {
   businessList,
   createProject as handleCreateProject,
   editProject,
-  fetchAllProjectList,
   fetchProjectList,
   getProject,
 } from '@/api/modules/project';
@@ -44,29 +43,6 @@ export default function useProjects() {
     return data as IProjectListData;
   };
 
-  // 获取所有项目列表(项目列表页面)
-  async function getAllProjectList(params: any = {}, config = {}) {
-    const result = await fetchAllProjectList(params,  { needRes: true, ...config })
-      .catch(() => ({
-        data: {},
-        webAnnotations: {
-          perms: {},
-        },
-      }));
-    return {
-      data: result.data.results.map(project => ({
-        ...project,
-        cc_app_id: project.businessID,
-        cc_app_name: project.businessName,
-        project_id: project.projectID,
-        project_name: project.name,
-        project_code: project.projectCode,
-      })),
-      total: result.data.total,
-      web_annotations: result.web_annotations,
-    };
-  };
-
   async function updateProject(params: any) {
     const result = await editProject(params).then(() => true)
       .catch(() => false);
@@ -115,7 +91,6 @@ export default function useProjects() {
   return {
     fetchProjectInfo,
     getProjectList,
-    getAllProjectList,
     updateProject,
     getBusinessList,
     createProject,
diff --git a/bcs-ui/frontend/src/views/resource-view/view-manage/view-selector.vue b/bcs-ui/frontend/src/views/resource-view/view-manage/view-selector.vue
index 6734d742f0..9e7348487b 100644
--- a/bcs-ui/frontend/src/views/resource-view/view-manage/view-selector.vue
+++ b/bcs-ui/frontend/src/views/resource-view/view-manage/view-selector.vue
@@ -83,6 +83,7 @@
           cluster-type="all"
           :value="clusterID"
           :selectable="isDefaultView"
+          :isShow="!isHide"
           v-show="viewMode === 'cluster'"
           @click="changeClusterView" />
         <!-- 自定义视图 -->