Skip to content

Commit

Permalink
Merge pull request #1300 from MZC-CSC/master
Browse files Browse the repository at this point in the history 
Add validation for node group length and support KeyPair IID label in GCP cluster handler.
  • Loading branch information
@powerkimhub
powerkimhub authored Aug 26, 2024
2 parents 0aa4226 + 5b931d0 commit dab8b06
Show file tree
Hide file tree
Showing 2 changed files with 83 additions and 25 deletions.
101 changes: 78 additions & 23 deletions cloud-control-manager/cloud-driver/drivers/gcp/resources/ClusterHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,44 @@ sg(firewall rule) 추가 안됨.
fail 기다리는것 처리 확인할 것.
*/

var (
ErrNodeGroupEmpty = errors.New("node group is empty. it must be greater than 0")
ErrNodeGroupNameEmpty = errors.New("node group name is empty")
ErrNodeGroupVMSpecEmpty = errors.New("node group vm spec is empty")
ErrInvalidNodeGroupDiskSize = errors.New("invalid NodeGroup RootDiskSize")
ErrNodeGroupKeypairEmpty = errors.New("node group keypair is empty")
)

func validateNodeGroup(ngl []irs.NodeGroupInfo) error {
if len(ngl) <= 0 {
return ErrNodeGroupEmpty
}

for _, nodeGroup := range ngl {
if nodeGroup.IId.NameId == "" {
return ErrNodeGroupNameEmpty
}

if nodeGroup.VMSpecName == "" {
return ErrNodeGroupVMSpecEmpty
}

if !(nodeGroup.RootDiskSize == "" || strings.ToLower(nodeGroup.RootDiskSize) == "default") {
_, err := strconv.Atoi(nodeGroup.RootDiskSize)
if err != nil {
return ErrInvalidNodeGroupDiskSize
}
}

if nodeGroup.KeyPairIID.SystemId == "" {
return ErrNodeGroupKeypairEmpty
}
}

return nil
}

func (ClusterHandler *GCPClusterHandler) CreateCluster(clusterReqInfo irs.ClusterInfo) (irs.ClusterInfo, error) {
projectID := ClusterHandler.Credential.ProjectID
region := ClusterHandler.Region.Region
Expand All @@ -71,10 +109,16 @@ func (ClusterHandler *GCPClusterHandler) CreateCluster(clusterReqInfo irs.Cluste
// parent := "projects/" + projectID + "/locations/" + zone
//projects/csta-349809/locations/asia-northeast3-a

// as per https://github.com/cloud-barista/cb-spider/issues/1252#issuecomment-2303556504
// gcp cluster only support create cluster with at least one custom node pool
if err := validateNodeGroup(clusterReqInfo.NodeGroupList); err != nil {
return irs.ClusterInfo{}, err
}

// Meta정보에 securityGroup 정보를 Key,Val 형태로 넣고 실제 값(val)은 nodeConfig 에 set하여 사용
labels := make(map[string]string)
var sgTags []string
if clusterReqInfo.Network.SecurityGroupIIDs != nil && len(clusterReqInfo.Network.SecurityGroupIIDs) > 0 {
if len(clusterReqInfo.Network.SecurityGroupIIDs) > 0 {
for idx, securityGroupIID := range clusterReqInfo.Network.SecurityGroupIIDs {
labels[GCP_PMKS_SECURITYGROUP_TAG+strconv.Itoa(idx)] = securityGroupIID.NameId
sgTags = append(sgTags, securityGroupIID.NameId)
Expand Down Expand Up @@ -105,7 +149,7 @@ func (ClusterHandler *GCPClusterHandler) CreateCluster(clusterReqInfo irs.Cluste
// nodeGroup List set
nodePools := []*container.NodePool{}
cblogger.Info("clusterReqInfo.NodeGroupList ", len(clusterReqInfo.NodeGroupList))
if clusterReqInfo.NodeGroupList != nil && len(clusterReqInfo.NodeGroupList) > 0 {
if len(clusterReqInfo.NodeGroupList) > 0 {
// 최초 생성 시 nodeGroup을 1개 지정함. 2개 이상일 때는 생성 후에 add NodeGroup으로 추가
for _, reqNodeGroup := range clusterReqInfo.NodeGroupList {
nodePool := container.NodePool{}
Expand All @@ -121,20 +165,27 @@ func (ClusterHandler *GCPClusterHandler) CreateCluster(clusterReqInfo irs.Cluste
}

nodeConfig := container.NodeConfig{}
diskSize, err := strconv.ParseInt(reqNodeGroup.RootDiskSize, 10, 64)
if err != nil {
return irs.ClusterInfo{}, err

if reqNodeGroup.RootDiskSize != "" && strings.ToLower(reqNodeGroup.RootDiskType) != "default" {
diskSize, err := strconv.ParseInt(reqNodeGroup.RootDiskSize, 10, 64)
if err != nil {
return irs.ClusterInfo{}, err
}

if diskSize > 0 {
nodeConfig.DiskSizeGb = diskSize
}
}
if diskSize > 0 {
nodeConfig.DiskSizeGb = diskSize

if reqNodeGroup.RootDiskType != "" && strings.ToLower(reqNodeGroup.RootDiskType) != "default" {
nodeConfig.DiskType = reqNodeGroup.RootDiskType
}
nodeConfig.DiskType = reqNodeGroup.RootDiskType

nodeConfig.MachineType = reqNodeGroup.VMSpecName
nodeConfig.Tags = sgTags

keyPair := map[string]string{}
if reqNodeGroup.KeyPairIID.SystemId != "" {
//keyPair[GCP_PMKS_KEYPAIR_KEY] = reqNodeGroup.KeyPairIID.NameId
keyPair[GCP_PMKS_KEYPAIR_KEY] = reqNodeGroup.KeyPairIID.SystemId
nodeConfig.Labels = keyPair
}
Expand All @@ -145,11 +196,12 @@ func (ClusterHandler *GCPClusterHandler) CreateCluster(clusterReqInfo irs.Cluste
//break //1개만 add?
}
rb.Cluster.NodePools = nodePools
} else {
// NodeGroup 이 1개는 넘어오므로 cluster의 InitialNodeCount는 동시에 Set 못함.
// NodeGroup이 없는경우 Set.
reqCluster.InitialNodeCount = 3 // Cluster.initial_node_count must be greater than zero
}
// else {
// NodeGroup 이 1개는 넘어오므로 cluster의 InitialNodeCount는 동시에 Set 못함.
// NodeGroup이 없는경우 Set.
// reqCluster.InitialNodeCount = 3 // Cluster.initial_node_count must be greater than zero
// }

cblogger.Debug(rb)
// if 1 == 1 {
Expand Down Expand Up @@ -958,6 +1010,16 @@ func mappingNodeGroupInfo(nodePool *container.NodePool) (NodeGroupInfo irs.NodeG
}

}

// add keypair label
if nodePool.Config != nil && nodePool.Config.Labels != nil {
for k, v := range nodePool.Config.Labels {
if strings.HasPrefix(k, GCP_PMKS_KEYPAIR_KEY) {
keyValueList = append(keyValueList, irs.KeyValue{Key: GCP_PMKS_KEYPAIR_KEY, Value: v})
}
}
}

nodeGroupInfo.KeyValueList = keyValueList

return nodeGroupInfo, nil
Expand Down Expand Up @@ -1136,21 +1198,14 @@ func convertNodeGroup(client *compute.Service, credential idrv.CredentialInfo, r
// nodeGroup의 Instance ID
nodeIID := irs.IID{NameId: instanceInfo.Name, SystemId: instanceInfo.Name}
nodeList = append(nodeList, nodeIID)

cblogger.Info("instanceInfo.Labels ", instanceInfo.Labels)
nodeGroupInfo.KeyPairIID = irs.IID{NameId: "NameId", SystemId: "SystemId"} // empty면 오류나므로 기본값으로 설정후 update하도록
if instanceInfo.Labels != nil {
keyPairVal, exists := instanceInfo.Labels[GCP_PMKS_KEYPAIR_KEY]
if exists {
cblogger.Info("nodeGroup set keypair ", keyPairVal)
nodeGroupInfo.KeyPairIID = irs.IID{NameId: keyPairVal, SystemId: keyPairVal}
}
}
}
nodeGroupInfo.KeyPairIID = irs.IID{NameId: "NameId", SystemId: "SystemId"} // empty면 오류나므로 기본값으로 설정후 update하도록
cblogger.Info("nodeList ", nodeList)
nodeGroupInfo.Nodes = nodeList
//cblogger.Info("nodeGroupInfo ", nodeGroupInfo)
cblogger.Debug(nodeGroupInfo)
} else if strings.HasPrefix(keyValue.Key, GCP_PMKS_KEYPAIR_KEY) {
nodeGroupInfo.KeyPairIID = irs.IID{NameId: keyValue.Value, SystemId: keyValue.Value}
}
}
nodeGroupList = append(nodeGroupList, nodeGroupInfo)
Expand Down
7 changes: 5 additions & 2 deletions cloud-control-manager/cloud-driver/drivers/gcp/resources/CommonHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,10 @@ func WaitContainerOperationFail(client *container.Service, project string, regio
return err
}
cblogger.Debug(opSatus)
cblogger.Infof("==> Status: Progress: [%d] / [%s]", opSatus.Progress, opSatus.Status)

if opSatus.Progress != nil && len(opSatus.Progress.Metrics) > 0 && opSatus.Progress.Metrics[0] != nil {
cblogger.Infof("==> Status: Progress: [%d] / [%s]", opSatus.Progress.Metrics[0].IntValue, opSatus.Status)
}

//PENDING, RUNNING, or DONE.

Expand All @@ -554,7 +557,7 @@ func WaitContainerOperationFail(client *container.Service, project string, regio
after_time := time.Now()
diff := after_time.Sub(before_time)
if int(diff.Seconds()) > max_time {
cblogger.Errorf("Forcing termination of Wait because the status of resource [%s] has not completed within [%d] seconds.", max_time, resourceId)
cblogger.Infof("Forcing termination of Wait because the status of resource [%s] has not failed within [%d] seconds.", resourceId, max_time)
return nil
}
}
Expand Down

0 comments on commit dab8b06

Please sign in to comment.