diff --git a/examples/cassandra/image/Dockerfile b/examples/cassandra/image/Dockerfile index bfb697cc2f4..635cb8c6999 100644 --- a/examples/cassandra/image/Dockerfile +++ b/examples/cassandra/image/Dockerfile @@ -16,6 +16,9 @@ FROM google/debian:jessie COPY cassandra.list /etc/apt/sources.list.d/cassandra.list COPY run.sh /run.sh +COPY cassandra.yaml /cassandra.yaml +COPY logback.xml /logback.xml +COPY kubernetes-cassandra.jar /kubernetes-cassandra.jar RUN gpg --keyserver pgp.mit.edu --recv-keys F758CE318D77295D && \ gpg --export --armor F758CE318D77295D | apt-key add - && \ @@ -24,20 +27,32 @@ RUN gpg --keyserver pgp.mit.edu --recv-keys F758CE318D77295D && \ gpg --keyserver pgp.mit.edu --recv-keys 0353B12C && \ gpg --export --armor 0353B12C | apt-key add - && \ apt-get update && \ - apt-get -qq -y install procps cassandra openjdk-8-jre-headless && \ + apt-get -qq -y install procps cassandra openjdk-8-jre-headless && \ chmod a+rx /run.sh && \ mkdir -p /cassandra_data/data && \ - chown -R cassandra.cassandra /etc/cassandra /cassandra_data && \ + mv /logback.xml /etc/cassandra/ && \ + mv /cassandra.yaml /etc/cassandra/ && \ + chown -R cassandra: /etc/cassandra /cassandra_data /run.sh \ + /kubernetes-cassandra.jar && \ chmod o+w -R /etc/cassandra /cassandra_data && \ - rm -rf /var/lib/apt/lists/* && \ - rm -rf /usr/share/doc/ && \ - rm -rf /usr/share/doc-base/ && \ - rm -rf /usr/share/man/ && \ - rm -rf /tmp/* + rm -rf \ + doc \ + man \ + info \ + locale \ + /var/lib/apt/lists/* \ + /var/log/* \ + /var/cache/debconf/* \ + common-licenses \ + ~/.bashrc \ + /etc/systemd \ + /lib/lsb \ + /lib/udev \ + /usr/share/doc/ \ + /usr/share/doc-base/ \ + /usr/share/man/ \ + /tmp/* -COPY cassandra.yaml /etc/cassandra/cassandra.yaml -COPY logback.xml /etc/cassandra/logback.xml -COPY kubernetes-cassandra.jar /kubernetes-cassandra.jar VOLUME ["/cassandra_data/data"] diff --git a/examples/cassandra/image/cassandra.list b/examples/cassandra/image/cassandra.list index f82805c7aa1..832c02ab436 100644 --- a/examples/cassandra/image/cassandra.list +++ b/examples/cassandra/image/cassandra.list @@ -1,5 +1,5 @@ -deb http://www.apache.org/dist/cassandra/debian 34x main -deb-src http://www.apache.org/dist/cassandra/debian 34x main +deb http://www.apache.org/dist/cassandra/debian 35x main +deb-src http://www.apache.org/dist/cassandra/debian 35x main # for jre8 deb http://http.debian.net/debian jessie-backports main diff --git a/examples/cassandra/image/kubernetes-cassandra.jar b/examples/cassandra/image/kubernetes-cassandra.jar index e0f62c4ce2e..9adc53bf469 100644 Binary files a/examples/cassandra/image/kubernetes-cassandra.jar and b/examples/cassandra/image/kubernetes-cassandra.jar differ diff --git a/examples/cassandra/image/run.sh b/examples/cassandra/image/run.sh index 0e7fc97dfc7..8db3c2ddbc9 100644 --- a/examples/cassandra/image/run.sh +++ b/examples/cassandra/image/run.sh @@ -18,7 +18,7 @@ set -e CFG=/etc/cassandra/cassandra.yaml CASSANDRA_RPC_ADDRESS="${CASSANDRA_RPC_ADDRESS:-0.0.0.0}" CASSANDRA_NUM_TOKENS="${CASSANDRA_NUM_TOKENS:-32}" -CASSANDRA_CLUSTER_NAME="${CASSANDRA_CLUSTER_NAME:=Test Cluster}" +CASSANDRA_CLUSTER_NAME="${CASSANDRA_CLUSTER_NAME:='Test Cluster'}" CASSANDRA_LISTEN_ADDRESS=${POD_IP} CASSANDRA_BROADCAST_ADDRESS=${POD_IP} CASSANDRA_BROADCAST_RPC_ADDRESS=${POD_IP} diff --git a/examples/cassandra/java/pom.xml b/examples/cassandra/java/pom.xml index 4c9824f9a9d..a18969ccca2 100644 --- a/examples/cassandra/java/pom.xml +++ b/examples/cassandra/java/pom.xml @@ -17,7 +17,7 @@ 4.0.0 io.k8s.cassandra kubernetes-cassandra - 1.0.0 + 1.0.1 @@ -85,7 +85,7 @@ org.apache.cassandra cassandra-all - 3.4 + 3.5 provided diff --git a/examples/cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java b/examples/cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java index 9865e1ba7df..830e9e17dc2 100644 --- a/examples/cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java +++ b/examples/cassandra/java/src/main/java/io/k8s/cassandra/KubernetesSeedProvider.java @@ -152,7 +152,7 @@ public class KubernetesSeedProvider implements SeedProvider { logger.warn("Endpoints are not available using default seeds in cassandra.yaml"); return Collections.unmodifiableList(defaultSeeds); } - } catch (IOException | NoSuchAlgorithmException | KeyManagementException ex) { + } catch (Exception ex) { logger.warn("Request to kubernetes apiserver failed, using default seeds in cassandra.yaml", ex); return Collections.unmodifiableList(defaultSeeds); }