fix: cloud provider should only generate userAgent if it's not provided

fix
kubernetes-sigs · Dec 3, 2024 · 4875121 · 4875121
1 parent b54a1c9
commit 4875121
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/pkg/azureclients/armclient/azure_armclient.go b/pkg/azureclients/armclient/azure_armclient.go
@@ -172,6 +172,9 @@ func New(authorizer autorest.Authorizer, clientConfig azureclients.ClientConfig,
 // example:
 // Azure-SDK-for-Go/7.0.1 arm-network/2016-09-01; kubernetes-cloudprovider/v1.17.0;
 func GetUserAgent(client autorest.Client) string {
+	if client.UserAgent != "" {
+		return client.UserAgent
+	}
 	k8sVersion := version.Get().GitVersion
 	return fmt.Sprintf("%s; kubernetes-cloudprovider/%s", client.UserAgent, k8sVersion)
 }

diff --git a/pkg/provider/azure.go b/pkg/provider/azure.go
@@ -468,8 +468,11 @@ func (az *Cloud) InitializeCloudFromConfig(ctx context.Context, config *config.C
 	az.configAzureClients(servicePrincipalToken, multiTenantServicePrincipalToken, networkResourceServicePrincipalToken)
 
 	if az.ComputeClientFactory == nil {
-		k8sVersion := version.Get().GitVersion
-		az.ARMClientConfig.UserAgent = fmt.Sprintf("kubernetes-cloudprovider/%s; %s", k8sVersion, az.ARMClientConfig.UserAgent)
+		if az.ARMClientConfig.UserAgent == "" {
+			k8sVersion := version.Get().GitVersion
+			az.ARMClientConfig.UserAgent = fmt.Sprintf("kubernetes-cloudprovider/%s", k8sVersion)
+		}
+
 		var cred azcore.TokenCredential
 		if authProvider.IsMultiTenantModeEnabled() {
 			multiTenantCred := authProvider.GetMultiTenantIdentity()