From fc95953b02daea29d8abaa39591f407782102f2b Mon Sep 17 00:00:00 2001
From: zznnqq210 <309433612@qq.com>
Date: Sun, 11 Oct 2020 20:18:36 +0800
Subject: [PATCH] fix oauth token

---
 .../kubernetes/commons/KubernetesClientProperties.java | 10 ++++++++++
 .../additional-spring-configuration-metadata.json      |  6 ++++++
 .../cloud/kubernetes/KubernetesAutoConfiguration.java  |  1 +
 3 files changed, 17 insertions(+)

diff --git a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java
index b2bfaa6f..fab9c682 100644
--- a/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java
+++ b/spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java
@@ -76,6 +76,8 @@ public class KubernetesClientProperties {
 
 	private String proxyPassword;
 
+	private String oauthToken;
+
 	private String[] noProxy;
 
 	public String getClientCertData() {
@@ -282,4 +284,12 @@ public class KubernetesClientProperties {
 		this.noProxy = noProxy;
 	}
 
+	public String getOauthToken() {
+		return this.oauthToken;
+	}
+
+	public void setOauthToken(String oauthToken) {
+		this.oauthToken = oauthToken;
+	}
+
 }
diff --git a/spring-cloud-kubernetes-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-kubernetes-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json
index 0d34b832..16990084 100644
--- a/spring-cloud-kubernetes-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json
+++ b/spring-cloud-kubernetes-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json
@@ -36,6 +36,12 @@
 			"description": "Kubernetes API Password",
 			"defaultValue": ""
 		},
+		{
+			"name": "spring.cloud.kubernetes.client.oauthToken",
+			"type": "java.lang.String",
+			"description": "Kubernetes API Oauth Token",
+			"defaultValue": ""
+		},
 		{
 			"name": "spring.cloud.kubernetes.client.caCertFile",
 			"type": "java.lang.String",
diff --git a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java
index 67e78455..362283f6 100644
--- a/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java
+++ b/spring-cloud-kubernetes-core/src/main/java/org/springframework/cloud/kubernetes/KubernetesAutoConfiguration.java
@@ -89,6 +89,7 @@ public class KubernetesAutoConfiguration {
 				.withUsername(or(kubernetesClientProperties.getUsername(), base.getUsername()))
 				.withPassword(or(kubernetesClientProperties.getPassword(), base.getPassword()))
 
+				.withOauthToken(or(kubernetesClientProperties.getOauthToken(), base.getOauthToken()))
 				.withCaCertFile(or(kubernetesClientProperties.getCaCertFile(), base.getCaCertFile()))
 				.withCaCertData(or(kubernetesClientProperties.getCaCertData(), base.getCaCertData()))