You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2016/08/22 19:30:04 UTC
camel git commit: CAMEL-10262: camel-kubernetes component should be
able to rely on the current login token provided by kube config
Repository: camel
Updated Branches:
refs/heads/master ba6fc872e -> 5b873ffba
CAMEL-10262: camel-kubernetes component should be able to rely on the current login token provided by kube config
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/5b873ffb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b873ffb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b873ffb
Branch: refs/heads/master
Commit: 5b873ffbab9ecdfd3013661692a89a31a83b4cc4
Parents: ba6fc87
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Mon Aug 22 21:29:53 2016 +0200
Committer: Antonin Stefanutti <an...@stefanutti.fr>
Committed: Mon Aug 22 21:29:53 2016 +0200
----------------------------------------------------------------------
.../org/apache/camel/component/kubernetes/KubernetesEndpoint.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/5b873ffb/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
----------------------------------------------------------------------
diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
index f710e77..e520699 100644
--- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
+++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/KubernetesEndpoint.java
@@ -192,7 +192,8 @@ public class KubernetesEndpoint extends DefaultEndpoint {
&& ObjectHelper.isEmpty(configuration.getOauthToken())) {
builder.withUsername(configuration.getUsername());
builder.withPassword(configuration.getPassword());
- } else {
+ }
+ if (ObjectHelper.isNotEmpty(configuration.getOauthToken())) {
builder.withOauthToken(configuration.getOauthToken());
}
if (ObjectHelper.isNotEmpty(configuration.getCaCertData())) {