diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-03-20 13:49:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-20 13:49:54 +0000 |
| commit | f7c77bfc3add6c94c8f018e270beea993beefea5 (patch) | |
| tree | c81275e60d837161d6f2072e9ab12e82fbee2e66 /kubernetes/consul/templates/consul-agent-deployment.yaml | |
| parent | 1695fb61d7389cc624403016c94e750ff50c8d5f (diff) | |
| parent | 85d9d73270f01d0770c29e8516dd0154669e9cf5 (diff) | |
Merge "Move consul config from shared NFS to configmap"
Diffstat (limited to 'kubernetes/consul/templates/consul-agent-deployment.yaml')
| -rw-r--r-- | kubernetes/consul/templates/consul-agent-deployment.yaml | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/kubernetes/consul/templates/consul-agent-deployment.yaml b/kubernetes/consul/templates/consul-agent-deployment.yaml index a2bbe6636f..8d780f0e58 100644 --- a/kubernetes/consul/templates/consul-agent-deployment.yaml +++ b/kubernetes/consul/templates/consul-agent-deployment.yaml @@ -18,15 +18,26 @@ spec: name: consul-agent spec: containers: - - image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}" + - image: "{{ .Values.consulagentRegistry }}" command: ["/usr/local/bin/docker-entrypoint.sh"] args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}"] name: consul-server volumeMounts: - mountPath: /consul/config name: consul-agent-config + - mountPath: /consul/scripts + name: consul-agent-scripts-config + - mountPath: /consul/certs + name: consul-agent-certs-config volumes: - - hostPath: - path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config + - configMap: + name: consul-agent-configmap name: consul-agent-config + - configMap: + name: consul-agent-scripts-configmap + defaultMode: 0755 + name: consul-agent-scripts-config + - secret: + secretName: consul-agent-certs-secret + name: consul-agent-certs-config #{{ end }} |