From be779fa2d7f44b511bde929582b6340c650d24cc Mon Sep 17 00:00:00 2001 From: gfraboni Date: Tue, 19 Sep 2017 13:25:30 -0400 Subject: Add Consul support to 'OneClick' deployment. The OOM is moving to using Consul to provide health checks for all ONAP components. This push adds deployment of a 3 node Consul Server cluster and a single Consul agent to the 'OneClick' deployment. As a first step, health check scripts for the A&AI microservices have also been included. Support for additional ONAP components will follow. Issue-ID: OOM-86 Change-Id: Ib63f3d8b1b745551c9ec55b6529d022b32006e9c Signed-off-by: gfraboni --- .../consul/templates/consul-agent-deployment.yaml | 29 +++++++++++++++++++++ .../consul/templates/consul-server-deployment.yaml | 30 ++++++++++++++++++++++ .../consul/templates/consul-server-service.yaml | 22 ++++++++++++++++ 3 files changed, 81 insertions(+) create mode 100644 kubernetes/consul/templates/consul-agent-deployment.yaml create mode 100644 kubernetes/consul/templates/consul-server-deployment.yaml create mode 100644 kubernetes/consul/templates/consul-server-service.yaml (limited to 'kubernetes/consul/templates') diff --git a/kubernetes/consul/templates/consul-agent-deployment.yaml b/kubernetes/consul/templates/consul-agent-deployment.yaml new file mode 100644 index 0000000000..15318660b5 --- /dev/null +++ b/kubernetes/consul/templates/consul-agent-deployment.yaml @@ -0,0 +1,29 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: consul-agent + name: consul-agent + namespace: "{{ .Values.nsPrefix }}-consul" +spec: + selector: + matchLabels: + app: consul-agent + template: + metadata: + labels: + app: consul-agent + name: consul-agent + spec: + containers: + - image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}" + command: ["/usr/local/bin/docker-entrypoint.sh"] + args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}-consul"] + name: consul-server + volumeMounts: + - mountPath: /consul/config + name: consul-agent-config + volumes: + - hostPath: + path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config + name: consul-agent-config diff --git a/kubernetes/consul/templates/consul-server-deployment.yaml b/kubernetes/consul/templates/consul-server-deployment.yaml new file mode 100644 index 0000000000..3e6dcba865 --- /dev/null +++ b/kubernetes/consul/templates/consul-server-deployment.yaml @@ -0,0 +1,30 @@ +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + labels: + app: consul-server + name: consul-server + namespace: "{{ .Values.nsPrefix }}-consul" +spec: + replicas: 3 + selector: + matchLabels: + app: consul-server + template: + metadata: + labels: + app: consul-server + name: consul-server + spec: + containers: + - image: "{{ .Values.consulimageRegistry }}:{{ .Values.consuldockerTag }}" + command: ["/usr/local/bin/docker-entrypoint.sh"] + args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","consul-server.{{ .Values.nsPrefix }}-consul"] + name: consul-server + volumeMounts: + - mountPath: /consul/config + name: consul-server-config + volumes: + - hostPath: + path: {{ .Values.rootHostPath }}/{{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-server-config + name: consul-server-config diff --git a/kubernetes/consul/templates/consul-server-service.yaml b/kubernetes/consul/templates/consul-server-service.yaml new file mode 100644 index 0000000000..465456425e --- /dev/null +++ b/kubernetes/consul/templates/consul-server-service.yaml @@ -0,0 +1,22 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + app: consul-server + name: consul-server + namespace: "{{ .Values.nsPrefix }}-consul" +spec: + ports: + - name: consul-ui + nodePort: {{ .Values.nodePortPrefix }}70 + port: 8500 + protocol: TCP + targetPort: 8500 + - name: consul-join + nodePort: {{ .Values.nodePortPrefix }}71 + port: 8301 + protocol: TCP + targetPort: 8301 + selector: + app: consul-server + type: {{ .Values.service.type | quote }} -- cgit 1.2.3-korg