You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/01/11 15:01:14 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/camel-2.17.x e21612ab8 -> fc5c09b1f
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/fc5c09b1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/fc5c09b1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/fc5c09b1
Branch: refs/heads/camel-2.17.x
Commit: fc5c09b1febe923c5d799c4411c9ce32b955759b
Parents: e21612a
Author: Antonin Stefanutti <an...@stefanutti.fr>
Authored: Mon Aug 22 21:29:53 2016 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Wed Jan 11 15:59:18 2017 +0100
----------------------------------------------------------------------
.../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/fc5c09b1/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 d517d6f..543b5af 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
@@ -193,7 +193,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())) {