From dad60a0e719ae2232b567ad7989e108b6722766d Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Wed, 10 Jan 2018 11:37:25 -0500 Subject: Add support for dmaap and ueb for sdnc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update config-init container with the added files Change-Id: I8703307207c376a1f0a1410af126e4fa4be3fb13 Signed-off-by: Alexis de Talhouët Issue-ID: OOM-491 --- kubernetes/sdnc/templates/dmaap-deployment.yaml | 71 +++++++++++++++++++++++++ kubernetes/sdnc/templates/ueb-deployment.yaml | 71 +++++++++++++++++++++++++ kubernetes/sdnc/values.yaml | 9 ++-- 3 files changed, 145 insertions(+), 6 deletions(-) create mode 100644 kubernetes/sdnc/templates/dmaap-deployment.yaml create mode 100644 kubernetes/sdnc/templates/ueb-deployment.yaml (limited to 'kubernetes/sdnc') diff --git a/kubernetes/sdnc/templates/dmaap-deployment.yaml b/kubernetes/sdnc/templates/dmaap-deployment.yaml new file mode 100644 index 0000000000..75a2b0fe99 --- /dev/null +++ b/kubernetes/sdnc/templates/dmaap-deployment.yaml @@ -0,0 +1,71 @@ +#{{ if not .Values.disableSdncDmaap }} +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: dmaap-listener + namespace: "{{ .Values.nsPrefix }}-sdnc" +spec: + selector: + matchLabels: + app: dmaap-listener + template: + metadata: + labels: + app: dmaap-listener + name: dmaap-listener + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "sdnc-db-container", + "--container-name", + "sdnc-controller-container" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "dmaap-listener-readiness" + } + ]' + spec: + containers: + - command: + - /opt/onap/sdnc/dmaap-listener/bin/start-dmaap-listener.sh + env: + - name: PROPERTY_DIR + value: /opt/onap/sdnc/data/properties + - name: SDNC_CONFIG_DIR + value: /opt/onap/sdnc/data/properties + image: {{ .Values.image.dmaaplistener }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: dmaapp-listener-container + volumeMounts: + - mountPath: /etc/localtime + name: localtime + readOnly: true + - mountPath: /opt/onap/sdnc/data/properties/dhcpalert.properties + name: dmaap-dhcapalert-config + volumes: + - name: localtime + hostPath: + path: /etc/localtime + - name: dmaap-dhcapalert-config + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/dmaap/dhcpalert.properties + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/sdnc/templates/ueb-deployment.yaml b/kubernetes/sdnc/templates/ueb-deployment.yaml new file mode 100644 index 0000000000..7f5a8fd312 --- /dev/null +++ b/kubernetes/sdnc/templates/ueb-deployment.yaml @@ -0,0 +1,71 @@ +#{{ if not .Values.disableSdncUeb }} +apiVersion: extensions/v1beta1 +kind: Deployment +metadata: + name: ueb-listener + namespace: "{{ .Values.nsPrefix }}-sdnc" +spec: + selector: + matchLabels: + app: ueb-listener + template: + metadata: + labels: + app: ueb-listener + name: ueb-listener + annotations: + pod.beta.kubernetes.io/init-containers: '[ + { + "args": [ + "--container-name", + "sdnc-db-container", + "--container-name", + "sdnc-controller-container" + ], + "command": [ + "/root/ready.py" + ], + "env": [ + { + "name": "NAMESPACE", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "metadata.namespace" + } + } + } + ], + "image": "{{ .Values.image.readiness }}", + "imagePullPolicy": "{{ .Values.pullPolicy }}", + "name": "ueb-listener-readiness" + } + ]' + spec: + containers: + - command: + - /opt/onap/sdnc/ueb-listener/bin/start-ueb-listener.sh + env: + - name: PROPERTY_DIR + value: /opt/onap/sdnc/data/properties + - name: SDNC_CONFIG_DIR + value: /opt/onap/sdnc/data/properties + image: {{ .Values.image.ueblistener }} + imagePullPolicy: {{ .Values.pullPolicy }} + name: ueb-listener-container + volumeMounts: + - mountPath: /etc/localtime + name: localtime + readOnly: true + - mountPath: /opt/onap/sdnc/data/properties/ueb-listener.properties + name: ueb-config + volumes: + - name: localtime + hostPath: + path: /etc/localtime + - name: ueb-config + hostPath: + path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/ueb/ueb-listener.properties + imagePullSecrets: + - name: "{{ .Values.nsPrefix }}-docker-registry-key" +#{{ end }} \ No newline at end of file diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 407d047850..3ab624ae2a 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -7,9 +7,6 @@ image: dgbuilderSdnc: nexus3.onap.org:10001/onap/ccsdk-dgbuilder-image:v0.1.0 sdnc: nexus3.onap.org:10001/onap/sdnc-image:v1.2.1 admportalSdnc: nexus3.onap.org:10001/onap/admportal-sdnc-image:v1.2.1 - filebeat: docker.elastic.co/beats/filebeat:5.5.0 - -# FIXME -# Missing the following deps -# nexus3.onap.org:10001/onap/sdnc-dmaap-listener-image:v1.2.1 -# nexus3.onap.org:10001/onap/sdnc-ueb-listener-image:v1.2.1 \ No newline at end of file + ueblistener: nexus3.onap.org:10001/onap/sdnc-ueb-listener-image:v1.2.1 + dmaaplistener: nexus3.onap.org:10001/onap/sdnc-dmaap-listener-image:v1.2.1 + filebeat: docker.elastic.co/beats/filebeat:5.5.0 \ No newline at end of file -- cgit 1.2.3-korg