From 6eb7a1a36644cf8f43b32b7012b86a18d1aff70c Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Mon, 27 Mar 2017 03:48:30 -0700 Subject: [PATCH] azure: add k8s info to user-agent string --- pkg/cloudprovider/providers/azure/azure.go | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkg/cloudprovider/providers/azure/azure.go b/pkg/cloudprovider/providers/azure/azure.go index cc03b5d99eb..528f02ed08c 100644 --- a/pkg/cloudprovider/providers/azure/azure.go +++ b/pkg/cloudprovider/providers/azure/azure.go @@ -17,14 +17,17 @@ limitations under the License. package azure import ( + "fmt" "io" "io/ioutil" "k8s.io/kubernetes/pkg/cloudprovider" + "k8s.io/kubernetes/pkg/version" "github.com/Azure/azure-sdk-for-go/arm/compute" "github.com/Azure/azure-sdk-for-go/arm/network" "github.com/Azure/azure-sdk-for-go/arm/storage" + "github.com/Azure/go-autorest/autorest" "github.com/Azure/go-autorest/autorest/azure" "github.com/ghodss/yaml" "time" @@ -125,38 +128,47 @@ func NewCloud(configReader io.Reader) (cloudprovider.Interface, error) { az.SubnetsClient = network.NewSubnetsClient(az.SubscriptionID) az.SubnetsClient.BaseURI = az.Environment.ResourceManagerEndpoint az.SubnetsClient.Authorizer = servicePrincipalToken + configureUserAgent(&az.SubnetsClient.Client) az.RouteTablesClient = network.NewRouteTablesClient(az.SubscriptionID) az.RouteTablesClient.BaseURI = az.Environment.ResourceManagerEndpoint az.RouteTablesClient.Authorizer = servicePrincipalToken + configureUserAgent(&az.RouteTablesClient.Client) az.RoutesClient = network.NewRoutesClient(az.SubscriptionID) az.RoutesClient.BaseURI = az.Environment.ResourceManagerEndpoint az.RoutesClient.Authorizer = servicePrincipalToken + configureUserAgent(&az.RoutesClient.Client) az.InterfacesClient = network.NewInterfacesClient(az.SubscriptionID) az.InterfacesClient.BaseURI = az.Environment.ResourceManagerEndpoint az.InterfacesClient.Authorizer = servicePrincipalToken + configureUserAgent(&az.InterfacesClient.Client) az.LoadBalancerClient = network.NewLoadBalancersClient(az.SubscriptionID) az.LoadBalancerClient.BaseURI = az.Environment.ResourceManagerEndpoint az.LoadBalancerClient.Authorizer = servicePrincipalToken + configureUserAgent(&az.LoadBalancerClient.Client) az.VirtualMachinesClient = compute.NewVirtualMachinesClient(az.SubscriptionID) az.VirtualMachinesClient.BaseURI = az.Environment.ResourceManagerEndpoint az.VirtualMachinesClient.Authorizer = servicePrincipalToken az.VirtualMachinesClient.PollingDelay = 5 * time.Second + configureUserAgent(&az.VirtualMachinesClient.Client) az.PublicIPAddressesClient = network.NewPublicIPAddressesClient(az.SubscriptionID) az.PublicIPAddressesClient.BaseURI = az.Environment.ResourceManagerEndpoint az.PublicIPAddressesClient.Authorizer = servicePrincipalToken + configureUserAgent(&az.PublicIPAddressesClient.Client) az.SecurityGroupsClient = network.NewSecurityGroupsClient(az.SubscriptionID) az.SecurityGroupsClient.BaseURI = az.Environment.ResourceManagerEndpoint az.SecurityGroupsClient.Authorizer = servicePrincipalToken + configureUserAgent(&az.SecurityGroupsClient.Client) az.StorageAccountClient = storage.NewAccountsClientWithBaseURI(az.Environment.ResourceManagerEndpoint, az.SubscriptionID) az.StorageAccountClient.Authorizer = servicePrincipalToken + return &az, nil } @@ -194,3 +206,8 @@ func (az *Cloud) ScrubDNS(nameservers, searches []string) (nsOut, srchOut []stri func (az *Cloud) ProviderName() string { return CloudProviderName } + +func configureUserAgent(client *autorest.Client) { + k8sVersion := version.Get().GitVersion + client.UserAgent = fmt.Sprintf("%s; %s", client.UserAgent, k8sVersion) +}