Merge pull request #3352 from brendandburns/cassandra

Update cassandra example

examples/cassandra/cassandra-controller.yaml

@@ -12,7 +12,7 @@ desiredState:
         id: cassandra
         containers:
           - name: cassandra
-            image: kubernetes/cassandra
+            image: kubernetes/cassandra:v1
             command:
               - /run.sh
             cpu: 1000
@@ -21,10 +21,17 @@ desiredState:
                 containerPort: 9042
               - name: thrift
                 containerPort: 9160
+            volumeMounts:
+              - name: data
+                mountPath: /cassandra_data
             env:
               - key: MAX_HEAP_SIZE
                 value: 512M
               - key: HEAP_NEWSIZE
                 value: 100M
+        volumes:
+          - name: data
+            source:
+              emptyDir: {}
     labels:
       name: cassandra

examples/cassandra/cassandra.yaml

@@ -7,7 +7,7 @@ desiredState:
     id: cassandra
     containers:
       - name: cassandra
-        image: kubernetes/cassandra
+        image: kubernetes/cassandra:v1
         command:
           - /run.sh
         cpu: 1000
@@ -16,6 +16,9 @@ desiredState:
             containerPort: 9042
           - name: thrift
             containerPort: 9160
+        volumeMounts:
+          - name: data
+            mountPath: /cassandra_data
         env:
           - key: MAX_HEAP_SIZE
             value: 512M
@@ -23,6 +26,10 @@ desiredState:
             value: 100M
           - key: KUBERNETES_API_PROTOCOL
             value: http
+    volumes:
+      - name: data
+        source:
+          emptyDir: {}
 labels:
   name: cassandra
 

examples/cassandra/image/Dockerfile

@@ -17,5 +17,6 @@ RUN apt-get -qq -y install cassandra
 COPY cassandra.yaml /etc/cassandra/cassandra.yaml
 COPY run.sh /run.sh
 COPY kubernetes-cassandra.jar /kubernetes-cassandra.jar
+RUN chmod a+x /run.sh
 
 CMD /run.sh

examples/cassandra/image/cassandra.yaml

@@ -96,12 +96,12 @@ partitioner: org.apache.cassandra.dht.Murmur3Partitioner
 # the configured compaction strategy.
 # If not set, the default directory is $CASSANDRA_HOME/data/data.
 data_file_directories:
-    - /var/lib/cassandra/data
+    - /cassandra_data/data
 
 # commit log.  when running on magnetic HDD, this should be a
 # separate spindle than the data directories.
 # If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
-commitlog_directory: /var/lib/cassandra/commitlog
+commitlog_directory: /cassandra_data/commitlog
 
 # policy for data disk failures:
 # die: shut down gossip and Thrift and kill the JVM for any fs errors or