standardizing SDC helm charts

all pods come up
robot health reports HTTP 500 -> mostly due to missing dmaap
resolving filebeat merge conflict
addressing CI comments

do we need a pv/pvc for the logs?

Issue-ID: OOM-747

Change-Id: Id6f1e57fdaf3cd6d9f75e8bc1e5bfde39b91235e
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
Signed-off-by: Areli Fuss <af732p@intl.att.com>
(cherry picked from commit fe3e499547c91eadd71bde630594720b918c2af9)

1 files changed, 0 insertions, 137 deletions

diff --git a/kubernetes/sdc/templates/sdc-be.yaml b/kubernetes/sdc/templates/sdc-be.yaml
deleted file mode 100644
index 9cf036a55e..0000000000
--- a/kubernetes/sdc/templates/sdc-be.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-#{{ if not .Values.disableSdcSdcBe }}
-apiVersion: extensions/v1beta1
-kind: Deployment
-metadata:
-  labels:
-    app: sdc-be
-  name: sdc-be
-  namespace: "{{ .Values.nsPrefix }}"
-spec:
-  selector:
-    matchLabels:
-      app: sdc-be
-  template:
-    metadata:
-      labels:
-        app: sdc-be
-      name: sdc-be
-    spec:
-      initContainers:
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - sdc-es
-        - --container-name
-        - sdc-cs
-        - --container-name
-        - sdc-kb
-        env:
-        - name: NAMESPACE
-          valueFrom:
-            fieldRef:
-              apiVersion: v1
-              fieldPath: metadata.namespace
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: sdc-be-readiness
-      - command:
-        - /root/ready.py
-        args:
-        - --container-name
-        - dmaap
-        env:
-        - name: NAMESPACE
-          value: {{ .Values.nsPrefix }}
-        image: {{ .Values.image.readiness }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: sdc-dmaap-readiness
-      containers:
-      - env:
-        - name: ENVNAME
-          value: AUTO
-        - name: HOST_IP
-          valueFrom:
-            fieldRef:
-              fieldPath: status.podIP
-        image: {{ .Values.image.sdcBackend }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: sdc-be
-        volumeMounts:
-        - mountPath: /usr/share/elasticsearch/data/
-          name: sdc-sdc-es-es
-        - mountPath: /root/chef-solo/environments/
-          name: sdc-environments
-        - mountPath: /etc/localtime
-          name: sdc-localtime
-          readOnly: true
-        - mountPath: /var/lib/jetty/logs
-          name: sdc-logs
-        - mountPath: /var/log/onap
-          name: sdc-logs-2
-        - mountPath: /tmp/logback.xml
-          name: sdc-logback
-        lifecycle:
-          postStart:
-            exec:
-              command: ["/bin/sh", "-c", "export LOG=wait_logback.log; touch $LOG; export SRC=/tmp/logback.xml; export DST=/var/lib/jetty/config/catalog-be/; while [ ! -e $DST ]; do echo 'Waiting for $DST...' >> $LOG; sleep 5; done; sleep 2; /bin/cp -f $SRC $DST; echo 'Done' >> $LOG"]
-        ports:
-        - containerPort: 8443
-        - containerPort: 8080
-        readinessProbe:
-          tcpSocket:
-            port: 8443
-          initialDelaySeconds: 5
-          periodSeconds: 10
-      - image: {{ .Values.image.filebeat }}
-        imagePullPolicy: {{ .Values.pullPolicy }}
-        name: filebeat-onap
-        volumeMounts:
-        - mountPath: /usr/share/filebeat/filebeat.yml
-          name: filebeat-conf
-          subPath: filebeat.yml
-        - mountPath: /var/log/onap
-          name: sdc-logs-2
-        - mountPath: /usr/share/filebeat/data
-          name: sdc-data-filebeat
-      volumes:
-        - name: filebeat-conf
-          configMap:
-           name: sdc-filebeat-configmap
-        - name: sdc-logs-2
-          emptyDir: {}
-        - name: sdc-data-filebeat
-          emptyDir: {}
-        - name: sdc-logback
-          configMap:
-            name : sdc-log-be-configmap
-        - name: sdc-sdc-es-es
-          hostPath:
-            path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/sdc-es/ES
-        - name: sdc-environments
-          configMap:
-            name: sdc-environments-configmap
-            defaultMode: 0755
-        - name: sdc-localtime
-          hostPath:
-            path:  /etc/localtime
-        - name:  sdc-logs
-          hostPath:
-            path:  {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/sdc/logs
-      imagePullSecrets:
-      - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}