Fixing merge

Author: ryanjbaxter

spring-cloud-kubernetes-client-autoconfig/src/main/java/org/springframework/cloud/kubernetes/client/KubernetesClientAutoConfiguration.java

@@ -23,12 +23,15 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnCloudPlatform;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.cloud.CloudPlatform;
+import org.springframework.cloud.kubernetes.commons.KubernetesClientProperties;
 import org.springframework.cloud.kubernetes.commons.KubernetesCommonsAutoConfiguration;
 import org.springframework.cloud.kubernetes.commons.KubernetesNamespaceProvider;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.env.Environment;
 
+import static org.springframework.cloud.kubernetes.client.KubernetesClientUtils.kubernetesApiClient;
+
 /**
  * @author Ryan Baxter
  */
@@ -43,6 +46,14 @@ public CoreV1Api coreApi(ApiClient apiClient) {
 		return new CoreV1Api(apiClient);
 	}
 
+	@Bean
+	@ConditionalOnMissingBean
+	public ApiClient apiClient(KubernetesClientProperties clientProperties) {
+		ApiClient apiClient = kubernetesApiClient();
+		apiClient.setUserAgent(clientProperties.userAgent());
+		return apiClient;
+	}
+
 	@Bean
 	@ConditionalOnMissingBean
 	public KubernetesNamespaceProvider kubernetesNamespaceProvider(Environment environment) {