Skip to content

Commit

Permalink
minor: 调整google node manager位置
Browse files Browse the repository at this point in the history
  • Loading branch information
@Maclon9573
Maclon9573 committed Oct 17, 2023
1 parent 353f75c commit b46c5df
Show file tree
Hide file tree
Showing 5 changed files with 104 additions and 107 deletions.
27 changes: 27 additions & 0 deletions bcs-services/bcs-cluster-manager/internal/cloudprovider/google/api/compute.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import (

proto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/common"
)

const (
Expand Down Expand Up @@ -664,3 +665,29 @@ func (c *ComputeServiceClient) ListOSImages(ctx context.Context, gkeProjectID st

return subnetsList, nil
}

// InstanceToNode parse Instance information in gcloud to Node in clustermanager
func (c *ComputeServiceClient) InstanceToNode(ins *compute.Instance) *proto.Node {
zoneInfo, _ := GetGCEResourceInfo(ins.Zone)
zone, _ := c.GetZone(context.Background(), zoneInfo[len(zoneInfo)-1])

node := &proto.Node{}
node.NodeID = strconv.Itoa(int(ins.Id))
node.NodeName = ins.Name

if zoneInfo != nil {
node.ZoneID = zone.Zone
zoneID, _ := strconv.Atoi(zone.ZoneID)
node.Zone = uint32(zoneID)
node.ZoneName = zone.ZoneName
}

machineInfo, _ := GetGCEResourceInfo(ins.MachineType)
node.InstanceType = machineInfo[len(machineInfo)-1]

networkInfo := strings.Split(ins.NetworkInterfaces[0].Subnetwork, "/")
node.VPC = networkInfo[len(networkInfo)-1]
node.Status = common.StatusRunning

return node
}
70 changes: 70 additions & 0 deletions bcs-services/bcs-cluster-manager/internal/cloudprovider/google/api/utils.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ const (
BCSNodeGroupTaintEffect = "NO_EXECUTE"
)

const (
limit = 100
)

// GenerateInstanceUrl generates url for instance.
func GenerateInstanceUrl(zone, name string) string {
return fmt.Sprintf("/zones/%s/instances/%s", zone, name)
Expand Down Expand Up @@ -413,3 +417,69 @@ func GenerateUpdatePolicy() *compute.InstanceGroupManagerUpdatePolicy {

return p
}

// ListNodesByInstanceID list node by instance id
func ListNodesByInstanceID(ids []string, opt *cloudprovider.ListNodesOption) ([]*cmproto.Node, error) {
idChunks := utils.SplitStringsChunks(ids, limit)
nodeList := make([]*cmproto.Node, 0)

blog.Infof("ListNodesByInstanceID idChunks %+v", idChunks)
for _, chunk := range idChunks {
if len(chunk) > 0 {
nodes, err := transInstanceIDsToNodes(chunk, opt)
if err != nil {
blog.Errorf("ListNodesByInstanceID failed: %v", err)
return nil, err
}
if len(nodes) == 0 {
continue
}
nodeList = append(nodeList, nodes...)
}
}

return nodeList, nil
}

// transInstanceIDsToNodes trans IDList to Nodes
func transInstanceIDsToNodes(ids []string, opt *cloudprovider.ListNodesOption) ([]*cmproto.Node,
error) {
client, err := NewComputeServiceClient(opt.Common)
if err != nil {
blog.Errorf("create ComputeServiceClient failed when GetNodeByIP, %s", err.Error())
return nil, err
}

insList, err := client.ListZoneInstanceWithFilter(context.Background(), InstanceNameFilter(ids))
if err != nil {
blog.Errorf("ListZoneInstanceWithFilter failed, %s", err.Error())
return nil, err
}
instances := insList.Items
// check response data
blog.Infof("ListZoneInstanceWithFilter len(%d) id response num %d", len(ids), len(instances))
if len(instances) == 0 {
// * no data response
return nil, nil
}
if len(instances) != len(ids) {
blog.Warnf("ListZoneInstanceWithFilter expect %d, but got %d", len(ids), len(instances))
}

nodeMap := make(map[string]*cmproto.Node)
var nodes []*cmproto.Node
for _, inst := range instances {
node := client.InstanceToNode(inst)
// clean duplicated Node if user input multiple ip that
// belong to one instance
if _, ok := nodeMap[node.NodeID]; ok {
continue
}

nodeMap[node.NodeID] = node
node.InnerIP = inst.NetworkInterfaces[0].NetworkIP
nodes = append(nodes, node)
}

return nodes, nil
}
109 changes: 5 additions & 104 deletions ...internal/cloudprovider/google/api/node.go → ...ger/internal/cloudprovider/google/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,12 @@
* limitations under the License.
*/

package api
package google

import (
"context"
"fmt"
"math"
"strconv"
"strings"
"sync"

Expand All @@ -25,12 +24,8 @@ import (

proto "github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/api/clustermanager"
"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider"
"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/cloudprovider/google/api"
"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/common"
"github.com/Tencent/bk-bcs/bcs-services/bcs-cluster-manager/internal/utils"
)

const (
limit = 100
)

var nodeMgr sync.Once
Expand Down Expand Up @@ -63,7 +58,7 @@ func (n *NodeManager) GetCVMImageIDByImageName(imageName string, opt *cloudprovi

// GetCloudRegions get cloud regions
func (n *NodeManager) GetCloudRegions(opt *cloudprovider.CommonOption) ([]*proto.RegionInfo, error) {
client, err := NewComputeServiceClient(opt)
client, err := api.NewComputeServiceClient(opt)
if err != nil {
return nil, fmt.Errorf("create google client failed, err %s", err.Error())
}
Expand All @@ -76,7 +71,7 @@ func (n *NodeManager) GetCloudRegions(opt *cloudprovider.CommonOption) ([]*proto

// GetZoneList get zoneList by region
func (n *NodeManager) GetZoneList(opt *cloudprovider.CommonOption) ([]*proto.ZoneInfo, error) {
client, err := NewComputeServiceClient(opt)
client, err := api.NewComputeServiceClient(opt)
if err != nil {
return nil, fmt.Errorf("create google client failed, err %s", err.Error())
}
Expand All @@ -93,7 +88,7 @@ func (n *NodeManager) ListNodeInstanceType(info cloudprovider.InstanceInfo, opt
blog.Infof("ListNodeInstanceType zone: %s, nodeFamily: %s, cpu: %d, memory: %d",
info.Zone, info.NodeFamily, info.Cpu, info.Memory)

client, err := NewComputeServiceClient(opt)
client, err := api.NewComputeServiceClient(opt)
if err != nil {
return nil, fmt.Errorf("create google client failed, err %s", err.Error())
}
Expand Down Expand Up @@ -175,101 +170,7 @@ func (n *NodeManager) ListExternalNodesByIP(ips []string, opt *cloudprovider.Lis
return nil, cloudprovider.ErrCloudNotImplemented
}

// ListNodesByInstanceID list node by instance id
func (n *NodeManager) ListNodesByInstanceID(ids []string, opt *cloudprovider.ListNodesOption) ([]*proto.Node, error) {
idChunks := utils.SplitStringsChunks(ids, limit)
nodeList := make([]*proto.Node, 0)

blog.Infof("ListNodesByInstanceID idChunks %+v", idChunks)
for _, chunk := range idChunks {
if len(chunk) > 0 {
nodes, err := n.transInstanceIDsToNodes(chunk, opt)
if err != nil {
blog.Errorf("ListNodesByInstanceID failed: %v", err)
return nil, err
}
if len(nodes) == 0 {
continue
}
nodeList = append(nodeList, nodes...)
}
}

return nodeList, nil
}

// ListKeyPairs keyPairs list
func (n *NodeManager) ListKeyPairs(opt *cloudprovider.CommonOption) ([]*proto.KeyPair, error) {
return nil, cloudprovider.ErrCloudNotImplemented
}

// transInstanceIDsToNodes trans IDList to Nodes
func (n *NodeManager) transInstanceIDsToNodes(ids []string, opt *cloudprovider.ListNodesOption) ([]*proto.Node,
error) {
client, err := NewComputeServiceClient(opt.Common)
if err != nil {
blog.Errorf("create ComputeServiceClient failed when GetNodeByIP, %s", err.Error())
return nil, err
}

insList, err := client.ListZoneInstanceWithFilter(context.Background(), InstanceNameFilter(ids))
if err != nil {
blog.Errorf("ListZoneInstanceWithFilter failed, %s", err.Error())
return nil, err
}
instances := insList.Items
// check response data
blog.Infof("ListZoneInstanceWithFilter len(%d) id response num %d", len(ids), len(instances))
if len(instances) == 0 {
// * no data response
return nil, nil
}
if len(instances) != len(ids) {
blog.Warnf("ListZoneInstanceWithFilter expect %d, but got %d", len(ids), len(instances))
}

nodeMap := make(map[string]*proto.Node)
var nodes []*proto.Node
for _, inst := range instances {
node := InstanceToNode(client, inst)
// clean duplicated Node if user input multiple ip that
// belong to one instance
if _, ok := nodeMap[node.NodeID]; ok {
continue
}

nodeMap[node.NodeID] = node
node.InnerIP = inst.NetworkInterfaces[0].NetworkIP
nodes = append(nodes, node)
}

return nodes, nil
}

// InstanceToNode parse Instance information in gcloud to Node in clustermanager
// @param Instance: gcloud instance information, can not be nil;
// @return Node: cluster-manager node information;
func InstanceToNode(cli *ComputeServiceClient, ins *compute.Instance) *proto.Node {
zoneInfo, _ := GetGCEResourceInfo(ins.Zone)
zone, _ := cli.GetZone(context.Background(), zoneInfo[len(zoneInfo)-1])

node := &proto.Node{}
node.NodeID = strconv.Itoa(int(ins.Id))
node.NodeName = ins.Name

if zoneInfo != nil {
node.ZoneID = zone.Zone
zoneID, _ := strconv.Atoi(zone.ZoneID)
node.Zone = uint32(zoneID)
node.ZoneName = zone.ZoneName
}

machineInfo, _ := GetGCEResourceInfo(ins.MachineType)
node.InstanceType = machineInfo[len(machineInfo)-1]

networkInfo := strings.Split(ins.NetworkInterfaces[0].Subnetwork, "/")
node.VPC = networkInfo[len(networkInfo)-1]
node.Status = common.StatusRunning

return node
}
2 changes: 1 addition & 1 deletion bcs-services/bcs-cluster-manager/internal/cloudprovider/google/tasks/importCluster.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func importClusterNodesToCM(

instance, err := gceCli.GetInstance(ctx, nodeZone, v.Name)
if err == nil {
node = api.InstanceToNode(gceCli, instance)
node = gceCli.InstanceToNode(instance)
} else {
blog.Errorf("ImportClusterNodesToCM failed: %v", err)
node.Region = v.Labels[utils.RegionTopologyFlag]
Expand Down
3 changes: 1 addition & 2 deletions bcs-services/bcs-cluster-manager/internal/cloudprovider/google/tasks/updateDesiredNodes.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,15 +275,14 @@ func recordClusterInstanceToDB(ctx context.Context, state *cloudprovider.TaskSta
func transInstancesToNode(ctx context.Context, instanceNames []string, info *cloudprovider.CloudDependBasicInfo) (
[]string, error) {
var (
nodeCli = api.NodeManager{}
nodes = make([]*proto.Node, 0)
nodeIPs = make([]string, 0)
err error
)

taskID := cloudprovider.GetTaskIDFromContext(ctx)
err = retry.Do(func() error {
nodes, err = nodeCli.ListNodesByInstanceID(instanceNames, &cloudprovider.ListNodesOption{
nodes, err = api.ListNodesByInstanceID(instanceNames, &cloudprovider.ListNodesOption{
Common: info.CmOption,
ClusterVPCID: info.Cluster.VpcID,
})
Expand Down

0 comments on commit b46c5df

Please sign in to comment.