github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #19114 from uluyol/cassandra-perm 

Auto commit by PR queue bot
pull/6/head
k8s-merge-robot 2016-01-08 03:34:42 -08:00
parent 2106c72133 f4b4ca2989
commit 76b0c8d07a
4 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/cassandra/image/Dockerfile
View File

@ -19,7 +19,7 @@ COPY logback.xml /etc/cassandra/logback.xml
COPY run.sh /run.sh
COPY kubernetes-cassandra.jar /kubernetes-cassandra.jar
RUN chmod a+x /run.sh && \
RUN chmod a+rx /run.sh && \
mkdir -p /cassandra_data/data && \
chown -R cassandra.cassandra /etc/cassandra /cassandra_data && \
chmod o+w -R /etc/cassandra /cassandra_data

14
examples/cassandra/image/Makefile
View File

@ -4,11 +4,15 @@ VERSION=v7
all: build
# TODO: build the jar and copy it in
build:
docker build -t gcr.io/google_containers/cassandra:${VERSION} .
kubernetes-cassandra.jar: ../java/* ../java/src/io/k8s/cassandra/*.java
cd ../java && mvn package
mv ../java/target/kubernetes-cassandra*.jar kubernetes-cassandra.jar
cd ../java && mvn clean
build: kubernetes-cassandra.jar
docker build -t gcr.io/google_containers/cassandra:${VERSION} .
push: build
gcloud docker push gcr.io/google_containers/cassandra:${VERSION}
gcloud docker push gcr.io/google_containers/cassandra:${VERSION}
.PHONY: all
.PHONY: all build push

BIN
examples/cassandra/image/kubernetes-cassandra.jar
View File

Binary file not shown.

6
examples/cassandra/java/src/io/k8s/cassandra/KubernetesSeedProvider.java
View File

@ -129,8 +129,10 @@ public class KubernetesSeedProvider implements SeedProvider {
// Here is a problem point, endpoints.subsets can be null in first node cases.
if (endpoints.subsets != null && !endpoints.subsets.isEmpty()){
for (Subset subset : endpoints.subsets) {
for (Address address : subset.addresses) {
list.add(InetAddress.getByName(address.ip));
if (subset.addresses != null && !subset.addresses.isEmpty()) {
for (Address address : subset.addresses) {
list.add(InetAddress.getByName(address.ip));
}
}
}
}