From 10037b8cee505885c16f59a72a56c46ad5492275 Mon Sep 17 00:00:00 2001 From: yuryn Date: Mon, 4 Sep 2017 19:03:51 +0300 Subject: 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 --- kubernetes/aai/templates/aai-dmaap-deployment.yaml | 75 ---------------------- 1 file changed, 75 deletions(-) delete mode 100644 kubernetes/aai/templates/aai-dmaap-deployment.yaml (limited to 'kubernetes/aai/templates/aai-dmaap-deployment.yaml') diff --git a/kubernetes/aai/templates/aai-dmaap-deployment.yaml b/kubernetes/aai/templates/aai-dmaap-deployment.yaml deleted file mode 100644 index 37c27d0854..0000000000 --- a/kubernetes/aai/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" -- cgit 1.2.3-korg