fix: 修复cluster manager节点池更新问题

TencentBlueKing · Sep 12, 2024 · e04e654 · e04e654
1 parent 49b8a7b
commit e04e654
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/bcs-services/bcs-cluster-manager/internal/actions/nodegroup/get.go b/bcs-services/bcs-cluster-manager/internal/actions/nodegroup/get.go
@@ -76,10 +76,14 @@ func (ga *GetAction) Handle(
 
 func removeSensitiveInfo(group *cmproto.NodeGroup) *cmproto.NodeGroup {
 	if group != nil && group.LaunchTemplate != nil {
-		group.LaunchTemplate.InitLoginPassword = ""
+		if group.LaunchTemplate.InitLoginPassword != "" {
+			group.LaunchTemplate.InitLoginPassword = utils.RandomString(8)
+		}
 		if group.LaunchTemplate.KeyPair != nil {
+			if group.LaunchTemplate.KeyPair.KeyPublic != "" {
+				group.LaunchTemplate.KeyPair.KeyPublic = utils.RandomString(8)
+			}
 			group.LaunchTemplate.KeyPair.KeySecret = ""
-			group.LaunchTemplate.KeyPair.KeyPublic = ""
 		}
 	}
 	return group

diff --git a/bcs-services/bcs-cluster-manager/internal/cloudprovider/azure/nodegroup.go b/bcs-services/bcs-cluster-manager/internal/cloudprovider/azure/nodegroup.go
@@ -444,7 +444,8 @@ func (ng *NodeGroup) updateAgentPoolProperties(client api.AksService, cluster *p
 	// update agent pool
 	ctx, cancel = context.WithTimeout(context.Background(), 5*time.Minute)
 	defer cancel()
-	if _, err = client.UpdatePoolAndReturn(ctx, pool, "", cluster.SystemID, *pool.Name); err != nil {
+	if _, err = client.UpdatePoolAndReturn(ctx, pool, cloudprovider.GetClusterResourceGroup(cluster),
+		cluster.SystemID, *pool.Name); err != nil {
 		return errors.Wrapf(err, "UpdateNodeGroup: call UpdateAgentPool api failed")
 	}