diff --git a/pkg/utils/cloudconfig/azure/config.go b/pkg/utils/cloudconfig/azure/config.go index d37f5bffe..4252fdcdc 100644 --- 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.VnetName == "" { - return fmt.Errorf("virtual network 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 index 8c094a128..ee82119f0 100644 --- a/pkg/utils/cloudconfig/azure/config_test.go +++ b/pkg/utils/cloudconfig/azure/config_test.go @@ -133,22 +133,6 @@ func TestValidate(t *testing.T) { }, wantPass: false, }, - "VnetName empty": { - config: &CloudConfig{ - ARMClientConfig: azclient.ARMClientConfig{ - Cloud: "c", - }, - AzureAuthConfig: azclient.AzureAuthConfig{ - UseManagedIdentityExtension: true, - UserAssignedIdentityID: "a", - }, - Location: "l", - SubscriptionID: "s", - ResourceGroup: "v", - VnetName: "", - }, - wantPass: false, - }, "VnetResourceGroup empty": { config: &CloudConfig{ ARMClientConfig: azclient.ARMClientConfig{ @@ -559,8 +543,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 index 4c938e78c..e9cd2a593 100644 --- 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 index 38d7b5f2c..c16b45aa4 100644 --- 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