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 8d42dfd0..6da9468e 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 @@ -81,6 +81,8 @@ public class KubernetesClientProperties { private String proxyPassword; + private String oauthToken; + private String[] noProxy; private String serviceAccountNamespacePath = SERVICE_ACCOUNT_NAMESPACE_PATH; @@ -297,4 +299,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-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java index f2b669e4..06d255bd 100644 --- a/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java +++ b/spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java @@ -77,6 +77,7 @@ public class Fabric8AutoConfiguration { .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()))