Merge pull request #18825 from brendandburns/cassandra

examples/cassandra/README.md

@@ -83,7 +83,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: gcr.io/google_containers/cassandra:v6
+          image: gcr.io/google_containers/cassandra:v7
           name: cassandra
           ports:
             - containerPort: 9042
@@ -222,7 +222,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: gcr.io/google_containers/cassandra:v6
+          image: gcr.io/google_containers/cassandra:v7
           name: cassandra
           ports:
             - containerPort: 9042
@@ -339,7 +339,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: "gcr.io/google_containers/cassandra:v6"
+          image: "gcr.io/google_containers/cassandra:v7"
           name: cassandra
           ports:
             - containerPort: 9042

examples/cassandra/cassandra-controller.yaml

@@ -26,7 +26,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: gcr.io/google_containers/cassandra:v6
+          image: gcr.io/google_containers/cassandra:v7
           name: cassandra
           ports:
             - containerPort: 9042

examples/cassandra/cassandra-daemonset.yaml

@@ -25,7 +25,7 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: metadata.namespace
-          image: "gcr.io/google_containers/cassandra:v6"
+          image: "gcr.io/google_containers/cassandra:v7"
           name: cassandra
           ports:
             - containerPort: 9042

examples/cassandra/cassandra.yaml

@@ -11,7 +11,7 @@ spec:
     resources:
       limits:
         cpu: "0.1"
-    image: gcr.io/google_containers/cassandra:v6
+    image: gcr.io/google_containers/cassandra:v7
     name: cassandra
     ports:
     - name: cql

examples/cassandra/image/Makefile

+# build the cassandra image.
+
+VERSION=v7
+
+all: build
+
+# TODO: build the jar and copy it in
+build:
+        docker build -t gcr.io/google_containers/cassandra:${VERSION} .
+
+push: build
+        gcloud docker push gcr.io/google_containers/cassandra:${VERSION}
+
+.PHONY: all