From 3c19b0109f56d477fad66723a8db3314425d9334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 1 Sep 2023 15:40:29 +0800 Subject: [PATCH] fix(region): support skip sync vpc and secgorup (#17901) --- pkg/compute/models/cloudsync.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/cloudsync.go b/pkg/compute/models/cloudsync.go index c6a1044b1e..96223e9449 100644 --- a/pkg/compute/models/cloudsync.go +++ b/pkg/compute/models/cloudsync.go @@ -305,7 +305,9 @@ func syncRegionVPCs( if len(localVpcs[j].GlobalvpcId) > 0 { globalVpcIds = append(globalVpcIds, localVpcs[j].GlobalvpcId) } - syncVpcSecGroup(ctx, userCred, syncResults, provider, &localVpcs[j], remoteVpcs[j], syncRange) + if syncRange.IsNotSkipSyncResource(SecurityGroupManager) { + syncVpcSecGroup(ctx, userCred, syncResults, provider, &localVpcs[j], remoteVpcs[j], syncRange) + } } syncVpcNatgateways(ctx, userCred, syncResults, provider, &localVpcs[j], remoteVpcs[j], syncRange) syncVpcPeerConnections(ctx, userCred, syncResults, provider, &localVpcs[j], remoteVpcs[j], syncRange) @@ -2089,7 +2091,7 @@ func syncPublicCloudProviderInfo( if cloudprovider.IsSupportCompute(driver) { if syncRange.NeedSyncResource(cloudprovider.CLOUD_CAPABILITY_NETWORK) || syncRange.NeedSyncResource(cloudprovider.CLOUD_CAPABILITY_EIP) { // 需要先同步vpc，避免私有云eip找不到network - if !(driver.GetFactory().IsPublicCloud() && !syncRange.NeedSyncResource(cloudprovider.CLOUD_CAPABILITY_NETWORK)) { + if !(driver.GetFactory().IsPublicCloud() && !syncRange.NeedSyncResource(cloudprovider.CLOUD_CAPABILITY_NETWORK)) && syncRange.IsNotSkipSyncResource(VpcManager) { syncRegionVPCs(ctx, userCred, syncResults, provider, localRegion, remoteRegion, syncRange) } if syncRange.IsNotSkipSyncResource(ElasticipManager) {