SpringCloud/spring-cloud-kubernetes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zznnqq210-fix_token'

Browse Source
This commit is contained in:
Ryan Baxter
2021-01-20 13:52:07 -05:00
parent 13f46cab23 728417535c
commit 2dc9920253
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-kubernetes-commons/src/main/java/org/springframework/cloud/kubernetes/commons/KubernetesClientProperties.java
View File

@@ -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;
}
}

6
spring-cloud-kubernetes-commons/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -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",

1
spring-cloud-kubernetes-fabric8-autoconfig/src/main/java/org/springframework/cloud/kubernetes/fabric8/Fabric8AutoConfiguration.java
View File

@@ -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()))