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

fix: 完善导入Azure集群数据同步的问题并修复部分bug #3695

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+97 −11
Open

fix: 完善导入Azure集群数据同步的问题并修复部分bug #3695

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1585d0e
修复导入Azure集群没有设置集群的节点最大pod值的问题
dove0012 Mar 12, 2025
1ed0878
修复golangci-lint规范问题
dove0012 Mar 13, 2025
83b57b2
修复更新集群的时候ClusterAdvanceSettings结构体可能为nil的情况
dove0012 Mar 14, 2025
4d49d0d
优化代码
dove0012 Mar 14, 2025
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
Prev Previous commit
Next Next commit
Loading
Loading status checks…
修复golangci-lint规范问题
@dove0012
dove0012 committed Mar 13, 2025

Verified

This commit was signed with the committer’s verified signature.
dove0012
GPG key ID: 554B23C4C8989E2C
Verified
Learn about vigilant mode
commit 1ed087844d535f7b919c62e544a765ed01488f9e
5 changes: 2 additions & 3 deletions bcs-services/bcs-cluster-manager/internal/cloudprovider/azure/cloud.go
View file
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ func (c *CloudInfoManager) SyncClusterCloudInfo(cls *proto.Cluster,
// cluster cloud basic setting
clusterBasicSettingByAzure(cls, cluster, opt)
// cluster cloud advance setting
clusterAdvanceSettingByAzure(cls, cluster, opt)
clusterAdvanceSettingByAzure(cls, cluster)
// cluster cloud network setting
err = clusterNetworkSettingByAzure(cls, cluster)
if err != nil {
@@ -131,8 +131,7 @@ func clusterBasicSettingByAzure(cls *proto.Cluster, cluster *armcontainerservice
}

// clusterAdvanceSettingByAzure 同步集群高级设置
func clusterAdvanceSettingByAzure(cls *proto.Cluster, cluster *armcontainerservice.ManagedCluster,
opt *cloudprovider.SyncClusterCloudInfoOption) {
func clusterAdvanceSettingByAzure(cls *proto.Cluster, cluster *armcontainerservice.ManagedCluster) {
if cls.ClusterAdvanceSettings == nil {
cls.ClusterAdvanceSettings = &proto.ClusterAdvanceSetting{
ClusterConnectSetting: &proto.ClusterConnectSetting{