Merge pull request #485 from andyzhangx/useragent

feat: add driver userAgent in ARM request

Author: andyzhangx

pkg/blob/azure.go

@@ -49,14 +49,15 @@ func IsAzureStackCloud(cloud *azureprovider.Cloud) bool {
 }
 
 // getCloudProvider get Azure Cloud Provider
-func getCloudProvider(kubeconfig, nodeID, secretName, secretNamespace string) (*azureprovider.Cloud, error) {
+func getCloudProvider(kubeconfig, nodeID, secretName, secretNamespace, userAgent string) (*azureprovider.Cloud, error) {
 	az := &azureprovider.Cloud{
 		InitSecretConfig: azureprovider.InitSecretConfig{
 			SecretName:      secretName,
 			SecretNamespace: secretNamespace,
 			CloudConfigKey:  "cloud-config",
 		},
 	}
+	az.UserAgent = userAgent
 	kubeClient, err := getKubeClient(kubeconfig)
 	if err != nil && !os.IsNotExist(err) && err != rest.ErrNotInCluster {
 		return az, fmt.Errorf("failed to get KubeClient: %v", err)

pkg/blob/azure_test.go

@@ -150,7 +150,7 @@ users:
 			}
 			os.Setenv(DefaultAzureCredentialFileEnv, fakeCredFile)
 		}
-		cloud, err := getCloudProvider(test.kubeconfig, test.nodeID, "", "")
+		cloud, err := getCloudProvider(test.kubeconfig, test.nodeID, "", "", "")
 		if !reflect.DeepEqual(err, test.expectedErr) {
 			t.Errorf("desc: %s,\n input: %q, GetCloudProvider err: %v, expectedErr: %v", test.desc, test.kubeconfig, err, test.expectedErr)
 		}

pkg/blob/blob.go

@@ -161,7 +161,9 @@ func (d *Driver) Run(endpoint, kubeconfig string, testBool bool) {
 	}
 	klog.Infof("\nDRIVER INFORMATION:\n-------------------\n%s\n\nStreaming logs below:", versionMeta)
 
-	d.cloud, err = getCloudProvider(kubeconfig, d.NodeID, d.cloudConfigSecretName, d.cloudConfigSecretNamespace)
+	userAgent := GetUserAgent(d.Name)
+	klog.V(2).Infof("driver userAgent: %s", userAgent)
+	d.cloud, err = getCloudProvider(kubeconfig, d.NodeID, d.cloudConfigSecretName, d.cloudConfigSecretNamespace, userAgent)
 	if err != nil {
 		klog.Fatalf("failed to get Azure Cloud Provider, error: %v", err)
 	}

pkg/blob/version.go

@@ -65,3 +65,8 @@ func GetVersionYAML(driverName string) (string, error) {
 	}
 	return strings.TrimSpace(string(marshalled)), nil
 }
+
+// GetUserAgent returns user agent of the driver
+func GetUserAgent(driverName string) string {
+	return fmt.Sprintf("%s/%s %s/%s (%s-%s) %s/%s", driverName, driverVersion, runtime.Compiler, runtime.Version(), runtime.GOARCH, runtime.GOOS, gitCommit, buildDate)
+}