From ab0ae0a64e2e97176957078bcd8a89e170d4b344 Mon Sep 17 00:00:00 2001 From: Brendan Burns Date: Tue, 24 Mar 2015 10:36:43 -0700 Subject: [PATCH] Update the cassandra example to pick up recent changes. Also make it buildable via Maven. --- examples/cassandra/README.md | 4 +- examples/cassandra/cassandra-controller.yaml | 2 +- examples/cassandra/cassandra.yaml | 2 +- .../cassandra/image/kubernetes-cassandra.jar | Bin 4552 -> 4653 bytes examples/cassandra/java/pom.xml | 37 ++++++++++++++++++ .../k8s/cassandra/KubernetesSeedProvider.java | 0 6 files changed, 41 insertions(+), 4 deletions(-) create mode 100644 examples/cassandra/java/pom.xml rename examples/cassandra/java/{ => src}/io/k8s/cassandra/KubernetesSeedProvider.java (100%) diff --git a/examples/cassandra/README.md b/examples/cassandra/README.md index 18338a233a9..90510e27589 100644 --- a/examples/cassandra/README.md +++ b/examples/cassandra/README.md @@ -23,7 +23,7 @@ desiredState: id: cassandra containers: - name: cassandra - image: kubernetes/cassandra + image: kubernetes/cassandra:v2 command: - /run.sh cpu: 1000 @@ -121,7 +121,7 @@ desiredState: id: cassandra containers: - name: cassandra - image: kubernetes/cassandra + image: kubernetes/cassandra:v2 command: - /run.sh cpu: 1000 diff --git a/examples/cassandra/cassandra-controller.yaml b/examples/cassandra/cassandra-controller.yaml index 345e7d79a63..e62979cfda5 100644 --- a/examples/cassandra/cassandra-controller.yaml +++ b/examples/cassandra/cassandra-controller.yaml @@ -12,7 +12,7 @@ desiredState: id: cassandra containers: - name: cassandra - image: kubernetes/cassandra:v1 + image: kubernetes/cassandra:v2 command: - /run.sh cpu: 1000 diff --git a/examples/cassandra/cassandra.yaml b/examples/cassandra/cassandra.yaml index c0afa4e2e4e..23efd35e9aa 100644 --- a/examples/cassandra/cassandra.yaml +++ b/examples/cassandra/cassandra.yaml @@ -7,7 +7,7 @@ desiredState: id: cassandra containers: - name: cassandra - image: kubernetes/cassandra:v1 + image: kubernetes/cassandra:v2 command: - /run.sh cpu: 1000 diff --git a/examples/cassandra/image/kubernetes-cassandra.jar b/examples/cassandra/image/kubernetes-cassandra.jar index 9120d88297d92d7a1944ce4b7cb2a90b2f45583e..faf86c690fee13f08f35f3d62cc827312e5ea721 100644 GIT binary patch literal 4653 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 diff --git a/examples/cassandra/java/pom.xml b/examples/cassandra/java/pom.xml new file mode 100644 index 00000000000..cf187fa07a0 --- /dev/null +++ b/examples/cassandra/java/pom.xml @@ -0,0 +1,37 @@ + + 4.0.0 + io.k8s.cassandra + kubernetes-cassandra + 0.0.2 + + src + + + + junit + junit + 3.8.1 + test + + + org.slf4j + slf4j-log4j12 + 1.7.5 + + + org.codehaus.jackson + jackson-core-asl + 1.6.3 + + + org.codehaus.jackson + jackson-mapper-asl + 1.6.3 + + + org.apache.cassandra + cassandra-all + 2.0.11 + + + diff --git a/examples/cassandra/java/io/k8s/cassandra/KubernetesSeedProvider.java b/examples/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java similarity index 100% rename from examples/cassandra/java/io/k8s/cassandra/KubernetesSeedProvider.java rename to examples/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java