Merge pull request #26022 from chrislovecnm/cassandra-image-bump

Automatic merge from submit-queue

fixing docker file, and bumping cassandra version

- had issue with current v9 build.  `cassandra.yaml` was not editable by the cassandra user, chown and chmod is now correct
- rebuild jar against 3.5 cassandra version and bumped C* version

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"]
 

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

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}

examples/cassandra/java/pom.xml

@@ -17,7 +17,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.k8s.cassandra</groupId>
     <artifactId>kubernetes-cassandra</artifactId>
-    <version>1.0.0</version>
+    <version>1.0.1</version>
     <build>
         <plugins>
             <plugin>
@@ -85,7 +85,7 @@
         <dependency>
             <groupId>org.apache.cassandra</groupId>
             <artifactId>cassandra-all</artifactId>
-            <version>3.4</version>
+            <version>3.5</version>
             <scope>provided</scope>
         </dependency>
 

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);
         }