From 1c01f4ac60389997c01fb4699dca667e038d3a7f Mon Sep 17 00:00:00 2001 From: Kenneth Evensen Date: Wed, 30 Sep 2015 19:03:38 -0400 Subject: [PATCH] Cassandra example - Modified line 103 in java/src/io/k8s/cassandra/KubernetesSeedProvider.java to accept the Kubernetes host as an environment variable from the pod template. Compiled the Jar and moved it to image/kubernetes-cassandra.jar. Changed the version number in the pom.xml file. --- cassandra/image/kubernetes-cassandra.jar | Bin 8636 -> 8449 bytes cassandra/java/pom.xml | 2 +- .../k8s/cassandra/KubernetesSeedProvider.java | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cassandra/image/kubernetes-cassandra.jar b/cassandra/image/kubernetes-cassandra.jar index 09e1aa203cf9914e03a33a13d837c47d0ecb6a3f..72a6b33a75e61625158e6dd44fd8716f41cec111 100644 GIT binary patch delta 5678 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 BJUIXW delta 5904 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 Ppb}!6i3B^4{wDK3qB6H5 diff --git a/cassandra/java/pom.xml b/cassandra/java/pom.xml index 0df1e546..b7a13190 100644 --- a/cassandra/java/pom.xml +++ b/cassandra/java/pom.xml @@ -2,7 +2,7 @@ 4.0.0 io.k8s.cassandra kubernetes-cassandra - 0.0.3 + 0.0.4 src diff --git a/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java b/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java index 3274da19..e4bf73be 100644 --- a/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java +++ b/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java @@ -100,7 +100,7 @@ public class KubernetesSeedProvider implements SeedProvider { public List getSeeds() { List list = new ArrayList(); - String host = "https://kubernetes.default.svc.cluster.local"; + String host = getEnvOrDefault("KUBERNETES_API_HOST","https://kubernetes.default.svc.cluster.local"); String serviceName = getEnvOrDefault("CASSANDRA_SERVICE", "cassandra"); String podNamespace = getEnvOrDefault("POD_NAMESPACE", "default"); String path = String.format("/api/v1/namespaces/%s/endpoints/", podNamespace);