[stable/consul] Allow configuration of consul datacenter name (#1230)

* Allow configuration of consul datacenter name

* Bump consul chart version

* Add DatacenterName default value to values.yaml
This commit is contained in:
Jonathan Stacks
2017-06-06 13:59:56 -07:00
committed by Lachlan Evenson
parent 15f457d263
commit c73fc60338
4 changed files with 12 additions and 4 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
name: consul
home: https://github.com/hashicorp/consul
version: 0.2.4
version: 0.2.5
appVersion: 0.7.5
description: Highly available and distributed service discovery and key-value store designed with support for the modern data center to make distributed systems and configuration easy.
icon: https://raw.githubusercontent.com/hashicorp/consul/bce3809dfca37b883828c3715b84143dd71c0f85/website/source/assets/images/favicons/android-chrome-512x512.png
+4 -3
View File
@@ -33,10 +33,11 @@ The following tables lists the configurable parameters of the consul chart and t
| `Replicas` | k8s statefulset replicas | `3` |
| `Component` | k8s selector key | `consul` |
| `Cpu` | container requested cpu | `100m` |
| `DisableHostNodeId` | Disable Node Id creation (uses random)| `false` |
| `DatacenterName` | Consul Datacenter Name | `dc1` (The consul default) |
| `DisableHostNodeId` | Disable Node Id creation (uses random)| `false` |
| `Memory` | container requested memory | `512Mi` |
| `Storage` | Persistent volume size | `1Gi` |
| `StorageClass` | Persistent volume storage class | `nil` |
| `StorageClass` | Persistent volume storage class | `nil` |
| `HttpPort` | Consul http listening port | `8500` |
| `RpcPort` | Consul rpc listening port | `8400` |
| `SerflanPort` | Container serf lan listening port | `8301` |
@@ -46,7 +47,7 @@ The following tables lists the configurable parameters of the consul chart and t
| `ServerPort` | Container server listening port | `8300` |
| `ConsulDnsPort` | Container dns listening port | `8600` |
| `ui.enabled` | Enable Consul Web UI | `false` |
| `uiService.enabled` | Create dedicated Consul Web UI svc | `false` |
| `uiService.enabled` | Create dedicated Consul Web UI svc | `false` |
| `uiService.type` | Dedicate Consul Web UI svc type | `NodePort` |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`.
+3
View File
@@ -172,6 +172,9 @@ spec:
{{- end }}
{{- if .Values.DisableHostNodeId }}
-disable-host-node-id \
{{- end }}
{{- if .Values.DatacenterName }}
-datacenter {{ .Values.DatacenterName }} \
{{- end }}
-data-dir=/var/lib/consul \
-server \
+4
View File
@@ -28,6 +28,10 @@ Storage: "1Gi"
## host id.
DisableHostNodeId: false
## Datacenter name for consul. If not supplied, will use the consul
## default 'dc1'
# DatacenterName: dc1
## StorageClass name for use with Persistent Volume Claim (PVC) using beta notations
# StorageClass: