fix: remove VnetName check from common cloudConfig package (Azure#956)

VnetName check only on fleet-member-agent
britaniar · Nov 15, 2024 · 4ded60a · 4ded60a
1 parent 448fa35
commit 4ded60a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/pkg/utils/cloudconfig/azure/config.go b/pkg/utils/cloudconfig/azure/config.go
@@ -88,10 +88,6 @@ func (cfg *CloudConfig) validate() error {
 		return fmt.Errorf("resource group is empty")
 	}
 
-	if cfg.UserAgent == "fleet-member-agent" && cfg.VnetName == "" {
-		return fmt.Errorf("vnet name is empty")
-	}
-
 	if cfg.VnetResourceGroup == "" {
 		cfg.VnetResourceGroup = cfg.ResourceGroup
 	}

diff --git a/pkg/utils/cloudconfig/azure/config_test.go b/pkg/utils/cloudconfig/azure/config_test.go
@@ -133,23 +133,6 @@ func TestValidate(t *testing.T) {
 			},
 			wantPass: false,
 		},
-		"VnetName empty": {
-			config: &CloudConfig{
-				ARMClientConfig: azclient.ARMClientConfig{
-					Cloud:     "c",
-					UserAgent: "fleet-member-agent",
-				},
-				AzureAuthConfig: azclient.AzureAuthConfig{
-					UseManagedIdentityExtension: true,
-					UserAssignedIdentityID:      "a",
-				},
-				Location:       "l",
-				SubscriptionID: "s",
-				ResourceGroup:  "v",
-				VnetName:       "",
-			},
-			wantPass: false,
-		},
 		"VnetResourceGroup empty": {
 			config: &CloudConfig{
 				ARMClientConfig: azclient.ARMClientConfig{
@@ -560,9 +543,8 @@ func TestNewCloudConfigFromFile(t *testing.T) {
 			filePath: "./test/azure_valid_config.json",
 			wantConfig: &CloudConfig{
 				ARMClientConfig: azclient.ARMClientConfig{
-					Cloud:     "AzurePublicCloud",
-					TenantID:  "00000000-0000-0000-0000-000000000000",
-					UserAgent: "fleet-member-agent",
+					Cloud:    "AzurePublicCloud",
+					TenantID: "00000000-0000-0000-0000-000000000000",
 				},
 				AzureAuthConfig: azclient.AzureAuthConfig{
 					UseManagedIdentityExtension: true,