VnetName check only on fleet-member-agent

britaniar · Nov 13, 2024 · 448fa35 · 448fa35
1 parent e7ebd08
commit 448fa35
Show file tree

Hide file tree

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

diff --git a/pkg/utils/cloudconfig/azure/config_test.go b/pkg/utils/cloudconfig/azure/config_test.go
@@ -136,7 +136,8 @@ func TestValidate(t *testing.T) {
 		"VnetName empty": {
 			config: &CloudConfig{
 				ARMClientConfig: azclient.ARMClientConfig{
-					Cloud: "c",
+					Cloud:     "c",
+					UserAgent: "fleet-member-agent",
 				},
 				AzureAuthConfig: azclient.AzureAuthConfig{
 					UseManagedIdentityExtension: true,
@@ -559,8 +560,9 @@ func TestNewCloudConfigFromFile(t *testing.T) {
 			filePath: "./test/azure_valid_config.json",
 			wantConfig: &CloudConfig{
 				ARMClientConfig: azclient.ARMClientConfig{
-					Cloud:    "AzurePublicCloud",
-					TenantID: "00000000-0000-0000-0000-000000000000",
+					Cloud:     "AzurePublicCloud",
+					TenantID:  "00000000-0000-0000-0000-000000000000",
+					UserAgent: "fleet-member-agent",
 				},
 				AzureAuthConfig: azclient.AzureAuthConfig{
 					UseManagedIdentityExtension: true,

diff --git a/pkg/utils/cloudconfig/azure/test/azure_valid_config.json b/pkg/utils/cloudconfig/azure/test/azure_valid_config.json
@@ -1,5 +1,6 @@
 {
   "cloud": "AzurePublicCloud",
+  "userAgent": "fleet-member-agent",
   "tenantId": "00000000-0000-0000-0000-000000000000",
   "subscriptionId": "00000000-0000-0000-0000-000000000000",
   "useManagedIdentityExtension": true,

diff --git a/test/e2e/azure_valid_config.yaml b/test/e2e/azure_valid_config.yaml
@@ -1,6 +1,7 @@
 config:
   azureCloudConfig:
     cloud: "AzurePublicCloud"
+    userAgent: "fleet-member-agent"
     tenantId: "00000000-0000-0000-0000-000000000000"
     subscriptionId: "00000000-0000-0000-0000-000000000000"
     useManagedIdentityExtension: true