Use DMaaP from message-router

Remove AAI DMaaP (with its zookeeper and kafka) and adjust AAI configuration to work with the common ONAP DMaaP from message-router project

Change-Id: Ia9a4348d2ad28623ddc0e1c149ef35d33db90fb4
Issue-ID: OOM-65
Signed-off-by: yuryn <Yury.Novitsky@Amdocs.com>

diff --git a/templates/aai-dmaap-deployment.yaml b/templates/aai-dmaap-deployment.yaml
deleted file mode 100644 (file)
index 37c27d0..0000000
--- a/templates/aai-dmaap-deployment.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: aai-dmaap
-  namespace: "{{ .Values.nsPrefix }}-aai"
-spec:
-  selector:
-    matchLabels:
-      app: aai-dmaap
-  template:
-    metadata:
-      labels:
-        app: aai-dmaap
-      name: aai-dmaap
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "aai-kafka",
-                  "--container-name",
-                  "aai-zookeeper"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "aai-dmaap-readiness"
-          }
-          ]'
-    spec:
-      containers:
-      - image: "{{ .Values.image.dmaapImage }}:{{ .Values.image.dmaapVersion}}"
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: aai-dmaap
-        ports:
-        - containerPort: 3904
-        - containerPort: 3905
-        readinessProbe:
-          tcpSocket:
-            port: 3904
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        volumeMounts:
-        - mountPath: /appl/dmaapMR1/bundleconfig/etc/appprops/MsgRtrApi.properties
-          name: appprops
-        - mountPath: /appl/dmaapMR1/etc/cadi.properties
-          name: cadi
-        - mountPath: /appl/dmaapMR1/etc/keyfile
-          name: mykey
-      restartPolicy: Always
-      volumes:
-      - name: appprops
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dmaap/MsgRtrApi.properties
-      - name: cadi
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dmaap/cadi.properties
-      - name: mykey
-        hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dmaap/mykey
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"

diff --git a/templates/aai-kafka-deployment.yaml b/templates/aai-kafka-deployment.yaml
deleted file mode 100644 (file)
index 0e7ef1f..0000000
--- a/templates/aai-kafka-deployment.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: aai-kafka
-  namespace: "{{ .Values.nsPrefix }}-aai"
-spec:
-  selector:
-    matchLabels:
-      app: aai-kafka
-  template:
-    metadata:
-      labels:
-        app: aai-kafka
-      name: aai-kafka
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "aai-zookeeper"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "aai-kafka-readiness"
-          }
-          ]'
-    spec:
-      containers:
-      - image: "{{ .Values.image.kafkaImage }}:{{ .Values.image.kafkaVersion }}"
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: aai-kafka
-        ports:
-        - containerPort: 9092
-        readinessProbe:
-          tcpSocket:
-            port: 9092
-          initialDelaySeconds: 5
-          periodSeconds: 10
-        env:
-        - name: KAFKA_ZOOKEEPER_CONNECT
-          value: "aai-zookeeper.{{ .Values.nsPrefix }}-aai:2181"
-        - name: KAFKA_ADVERTISED_HOST_NAME
-          value: "aai-kafka"
-        - name: KAFKA_BROKER_ID
-          value: "1"
-        - name: KAFKA_ADVERTISED_PORT
-          value: "9092"
-        - name: KAFKA_PORT
-          value: "9092"
-        volumeMounts:
-        - mountPath: /var/run/docker.sock
-          name: docker-socket
-        - mountPath: /kafka
-          name: kafka-data
-        - mountPath: /start-kafka.sh
-          name: start-kafka
-      restartPolicy: Always
-      volumes:
-      - name: docker-socket
-        hostPath:
-          path: /var/run/docker.sock
-      - name: kafka-data
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dcae-startup-vm-message-router/docker_files/data-kafka/"
-      - name: start-kafka
-        hostPath:
-          path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dcae-startup-vm-message-router/docker_files/start-kafka.sh"
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"

diff --git a/templates/aai-zookeeper-deployment.yaml b/templates/aai-zookeeper-deployment.yaml
deleted file mode 100644 (file)
index 7b6b4e1..0000000
--- a/templates/aai-zookeeper-deployment.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  name: aai-zookeeper
-  namespace: "{{ .Values.nsPrefix }}-aai"
-spec:
-  selector:
-    matchLabels:
-      app: aai-zookeeper
-  template:
-    metadata:
-      labels:
-        app: aai-zookeeper
-      name: aai-zookeeper
-    spec:
-      containers:
-      - image: "{{ .Values.image.aaiZookeeperImage }}:{{ .Values.image.aaiZookeeperVersion }}"
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: aai-zookeeper
-        volumeMounts:
-        - mountPath: /opt/zookeeper-3.4.9/data/
-          name: aai-zookeeper-data
-        ports:
-        - containerPort: 2181
-        readinessProbe:
-          tcpSocket:
-            port: 2181
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      volumes:
-        - name: aai-zookeeper-data
-          hostPath:
-            path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/message-router/dcae-startup-vm-message-router/docker_files/data-zookeeper"
-      restartPolicy: Always
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"

diff --git a/templates/all-services.yaml b/templates/all-services.yaml
index 63b9b00..4257dbb 100644 (file)
--- a/templates/all-services.yaml
+++ b/templates/all-services.yaml
@@ -229,38 +229,6 @@ spec:
 ---
 apiVersion: v1
 kind: Service
-metadata:
-  name: aai-dmaap
-  namespace: "{{ .Values.nsPrefix }}-aai"
-  labels:
-    app: aai-dmaap
-spec:
-  ports:
-  - name: "aai-dmaap-port-3904"
-    port: 3904
-  - name: "aai-dmaap-port-3905"
-    port: 3905
-  selector:
-    app: aai-dmaap
-  clusterIP: None
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: aai-zookeeper
-  namespace: "{{ .Values.nsPrefix }}-aai"
-  labels:
-    app: aai-zookeeper
-spec:
-  ports:
-  - name: "aai-zookeeper-port-2181"
-    port: 2181
-  selector:
-    app: aai-zookeeper
-  clusterIP: None
----
-apiVersion: v1
-kind: Service
 metadata:
   name: aai-traversal
   namespace: "{{ .Values.nsPrefix }}-aai"

diff --git a/values.yaml b/values.yaml
index 290ffc5..1504b40 100644 (file)
--- a/values.yaml
+++ b/values.yaml
@@ -9,14 +9,10 @@ image:
   aaiHbaseVersion: latest
   modelLoaderImage: nexus3.onap.org:10001/openecomp/model-loader
   modelLoaderVersion: 1.1-STAGING-latest
-  dmaapImage: attos/dmaap
-  dmaapVersion: latest
   aaiResourcesImage: nexus3.onap.org:10001/openecomp/aai-resources
   aaiResourcesVersion: 1.1-STAGING-latest
   aaiTraversalImage: nexus3.onap.org:10001/openecomp/aai-traversal
   aaiTraversalVersion: 1.1-STAGING-latest
-  aaiZookeeperImage: wurstmeister/zookeeper
-  aaiZookeeperVersion: latest
   dataRouterImage: nexus3.onap.org:10001/openecomp/data-router
   dataRouterVersion: 1.1-STAGING-latest
   elasticsearchImage: elasticsearch
@@ -26,5 +22,3 @@ image:
   sparkyBeImage: nexus3.onap.org:10001/openecomp/sparky-be
   sparkyBeVersion: 1.1-STAGING-latest
   gremlinServerImage: aaionap/gremlin-server
-  kafkaImage: wurstmeister/kafka
-  kafkaVersion: latest
\ No newline at end of file