Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update cassandra example #3352

Merged
merged 2 commits into from
Jan 9, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion examples/cassandra/cassandra-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ desiredState:
id: cassandra
containers:
- name: cassandra
image: kubernetes/cassandra
image: kubernetes/cassandra:v1
command:
- /run.sh
cpu: 1000
Expand All @@ -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
9 changes: 8 additions & 1 deletion examples/cassandra/cassandra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ desiredState:
id: cassandra
containers:
- name: cassandra
image: kubernetes/cassandra
image: kubernetes/cassandra:v1
command:
- /run.sh
cpu: 1000
Expand All @@ -16,13 +16,20 @@ 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
- key: KUBERNETES_API_PROTOCOL
value: http
volumes:
- name: data
source:
emptyDir: {}
labels:
name: cassandra

Expand Down
1 change: 1 addition & 0 deletions examples/cassandra/image/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions examples/cassandra/image/cassandra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down