UNTESTED - Switch to specifying persistence settings on logging and
kafka with helm CLI options
Change-Id: I3cb520dcbc497f9aa4a709ec878606846f722d8f
diff --git a/charts/kafka.md b/charts/kafka.md
index 1095486..80807fe 100644
--- a/charts/kafka.md
+++ b/charts/kafka.md
@@ -3,35 +3,19 @@
The *kafka* helm chart is not maintained by CORD, but it is available online
at: <https://github.com/kubernetes/charts/tree/master/incubator/kafka>
-To install kafka using the *cord-kafka* name, create a YAML values file to
-configure Kafka (for developers, this is in *helm-charts/example/kafka-single.yaml*):
-
-```yaml
----
-# Deploy a single replica of Kafka during development
-
-# configuration ref: https://kafka.apache.org/documentation/#configuration
-configurationOverrides:
- "offsets.topic.replication.factor": 1
- "log.retention.hours": 4
- "log.message.timestamp.type": "LogAppendTime"
-
-replicas: 1
-
-persistence:
- enabled: false
-
-zookeeper:
- replicaCount: 1
- persistence:
- enabled: false
-```
-
-Then run the following commands to start Kafka:
+To install Kafka using the `cord-kafka` name run the following commands:
```shell
helm repo add incubator http://storage.googleapis.com/kubernetes-charts-incubator
-helm install -f kafka-single.yaml --version 0.8.8 -n cord-kafka incubator/kafka
+helm install --version 0.8.8 \
+ --set configurationOverrides."offsets.topic.replication.factor"=1 \
+ --set configurationOverrides."log.retention.hours"=4 \
+ --set configurationOverrides."log.message.timestamp.type"="LogAppendTime" \
+ --set replicas=1 \
+ --set persistence.enabled=false \
+ --set zookeeper.replicaCount=1 \
+ --set zookeeper.persistence.enabled=false \
+ -n cord-kafka incubator/kafka
```
> NOTE: Historically there were two kafka busses deployed (another one named
diff --git a/charts/logging-monitoring.md b/charts/logging-monitoring.md
index ad30bb3..81845c1 100644
--- a/charts/logging-monitoring.md
+++ b/charts/logging-monitoring.md
@@ -33,45 +33,21 @@
charts to provide a persistent ElasticSearch database. You must install those
first before running the `logging` chart.
-In development scenarios where persistence isn't required, it can be disabled
-by using the following values file (if developing, this is located in
-`helm-charts/examples/logging-single.yaml`):
-
-```yaml
----
-# For development and testing logging, don't persist data and
-# run a minimum number of instances of elasticsearch components
-
-elasticsearch:
-
- cluster:
- env:
- MINIMUM_MASTER_NODES: "1"
-
- client:
- replicas: 1
-
- master:
- replicas: 2
- persistence:
- enabled: false
-
- data:
- replicas: 1
- persistence:
- enabled: false
-```
-
-Then either install the logging chart with persistent storage:
-
```shell
helm install -n logging cord/logging
```
-Or without:
+In development or testing scenarios where persistence isn't required, this
+command will load the logging chart without persistence:
```shell
-helm install -f logging-single.yaml -n logging cord/logging
+helm install --set elasticsearch.cluster.env.MINIMUM_MASTER_NODES="1" \
+ --set elasticsearch.client.replicas=1 \
+ --set elasticsearch.master.replicas=2 \
+ --set elasticsearch.master.persistence.enabled=false \
+ --set elasticsearch.data.replicas=1 \
+ --set elasticsearch.data.persistence.enabled=false \
+ -n logging cord/logging
```
### Logging Dashboard