Merge "Add support for dmaap and ueb for sdnc"

3 files changed, 122 insertions, 5 deletions

diff --git a/kubernetes/sdnc/templates/dmaap-deployment.yaml b/kubernetes/sdnc/templates/dmaap-deployment.yaml
new file mode 100644
index 0000000000..b0f0a7b7b5
--- /dev/null
+++ b/kubernetes/sdnc/templates/dmaap-deployment.yaml
@@ -0,0 +1,60 @@
+#{{ 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
+    spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - sdnc-db-container
+        - --container-name
+        - sdnc-controller-container
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: sdnc-dmaap-readiness
+      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..324e0e1724
--- /dev/null
+++ b/kubernetes/sdnc/templates/ueb-deployment.yaml
@@ -0,0 +1,60 @@
+#{{ 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
+    spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - sdnc-db-container
+        - --container-name
+        - sdnc-controller-container
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: sdnc-ueb-readiness
+      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 5272b653b9..395970957a 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -8,14 +8,11 @@ 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
+  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
 enableODLCluster: false
 numberOfODLReplicas: 1
 numberOfDbReplicas: 1
 disableSdncSdncDgbuilder: false
 disableSdncSdncPortal: false
-
-# 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