Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: azure CA选机型开放 2c 和 4G 的机器 #3595

Merged
merged 2 commits into from
Oct 29, 2024
Merged

fix: azure CA选机型开放 2c 和 4G 的机器 #3595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c6ae10
azure CA选机型开放 2c 和 4G 的机器
dove0012 Oct 29, 2024
e4bc783
修复golangci-lint规范
dove0012 Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions bcs-services/bcs-cluster-manager/internal/actions/nodegroup/delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,11 +576,9 @@ func (da *CleanNodesAction) getRelativeData() error {
func (da *CleanNodesAction) updateCleanNodesStatus() error {
// try to update Cluster & NodeGroup
for _, node := range da.cleanNodes {
node.Status = common.StatusDeleting
var err error

var (
err error
)
node.Status = common.StatusDeleting
// maybe update node timeout thus solve problem by retry
err = retry.Do(func() error {
if errLocal := da.model.UpdateNode(da.ctx, node); errLocal != nil {
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-cluster-manager/internal/cloudprovider/aws/tasks/updateDesiredNodes.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ import (
)

// ApplyInstanceMachinesTask update desired nodes task
func ApplyInstanceMachinesTask(taskID string, stepName string) error {
func ApplyInstanceMachinesTask(taskID string, stepName string) error { // nolint
start := time.Now()

// get task and task current step
Expand Down
2 changes: 1 addition & 1 deletion bcs-services/bcs-cluster-manager/internal/cloudprovider/azure/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ func (n *NodeManager) ListNodeInstanceType(info cloudprovider.InstanceInfo, opt
}

// filter cpu && mem
if cpu == 0 || mem == 0 || cpu < 4 || mem < 4 {
if cpu == 0 || mem == 0 || cpu < 2 || mem < 4 {
continue
}

Expand Down
Loading