CAMEL-9683: Kubernetes can lookup service using client,env or dns.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/eac7a25e Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/eac7a25e Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/eac7a25e Branch: refs/heads/remoteServiceCall Commit: eac7a25e68b9aff0e3f39b50bffb2c985554b9e1 Parents: f8ae163 Author: Claus Ibsen <davscl...@apache.org> Authored: Thu May 19 09:14:37 2016 +0200 Committer: Claus Ibsen <davscl...@apache.org> Committed: Mon May 23 09:28:17 2016 +0200 ---------------------------------------------------------------------- .../processor/KubernetesClientServiceCallProcessor.java | 7 ++++++- .../processor/KubernetesDnsServiceCallProcessor.java | 7 ++++++- .../processor/KubernetesEnvironmentServiceCallProcessor.java | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/eac7a25e/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesClientServiceCallProcessor.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesClientServiceCallProcessor.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesClientServiceCallProcessor.java index afe2bfd..1bdca12 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesClientServiceCallProcessor.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesClientServiceCallProcessor.java @@ -84,7 +84,12 @@ public class KubernetesClientServiceCallProcessor extends ServiceSupport impleme this.name = serviceName; } - this.namespace = namespace; + // if no namespace configured then resolve from environment variables + if (namespace == null) { + this.namespace = System.getenv("KUBERNETES_NAMESPACE"); + } else { + this.namespace = namespace; + } this.uri = uri; this.exchangePattern = exchangePattern; this.configuration = configuration; http://git-wip-us.apache.org/repos/asf/camel/blob/eac7a25e/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesDnsServiceCallProcessor.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesDnsServiceCallProcessor.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesDnsServiceCallProcessor.java index 46a4c7f..de66286 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesDnsServiceCallProcessor.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesDnsServiceCallProcessor.java @@ -77,7 +77,12 @@ public class KubernetesDnsServiceCallProcessor extends ServiceSupport implements this.name = serviceName; } - this.namespace = namespace; + // if no namespace configured then resolve from environment variables + if (namespace == null) { + this.namespace = System.getenv("KUBERNETES_NAMESPACE"); + } else { + this.namespace = namespace; + } this.uri = uri; this.exchangePattern = exchangePattern; this.dnsDomain = dnsDomain; http://git-wip-us.apache.org/repos/asf/camel/blob/eac7a25e/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesEnvironmentServiceCallProcessor.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesEnvironmentServiceCallProcessor.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesEnvironmentServiceCallProcessor.java index 88ca752..5c743b6 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesEnvironmentServiceCallProcessor.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/processor/KubernetesEnvironmentServiceCallProcessor.java @@ -76,7 +76,12 @@ public class KubernetesEnvironmentServiceCallProcessor extends ServiceSupport im this.name = serviceName; } - this.namespace = namespace; + // if no namespace configured then resolve from environment variables + if (namespace == null) { + this.namespace = System.getenv("KUBERNETES_NAMESPACE"); + } else { + this.namespace = namespace; + } this.uri = uri; this.exchangePattern = exchangePattern; this.serviceCallExpression = new KubernetesServiceCallExpression(this.name, this.scheme, this.contextPath, this.uri);
