From 51a8b1b6482fda1c0865481b7e04c54023589392 Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Tue, 24 Apr 2018 20:05:32 +0000
Subject: Adding sdc-onboarding-be to OOM

-adding sdc-onboarding-be chart
-sdc-cs and es are now in a cluster format
-using the sdc provided ready probe script for readiness
-increasing the initial delay as per sdc project team k8s specs
-fixed logging bugs.  logs for be, fe, onboard-be are now in /var/log/onap/sdc/blah

-sdc-be readiness health check is failing which prevents sdb-be from
becoming "ready".

-the commit that changes the template is:
Add cluster resiliance support (c033cdce906efc3b6ccd1d2f45544af47e328ed4)

Issue-ID: OOM-1002

Change-Id: Ib231cb1e7daa287a41e04db95528edecbdbbf7bc
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
---
 kubernetes/sdc/charts/sdc-fe/Chart.yaml            |  2 +-
 .../sdc/charts/sdc-fe/templates/deployment.yaml    | 23 +++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

(limited to 'kubernetes/sdc/charts/sdc-fe')

diff --git a/kubernetes/sdc/charts/sdc-fe/Chart.yaml b/kubernetes/sdc/charts/sdc-fe/Chart.yaml
index 9cbffbac4e..6580e891da 100644
--- a/kubernetes/sdc/charts/sdc-fe/Chart.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/Chart.yaml
@@ -13,6 +13,6 @@
 # limitations under the License.
 
 apiVersion: v1
-description: Service Design and Creation Front End
+description: ONAP Service Design and Creation Front End
 name: sdc-fe
 version: 2.0.0
\ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
index 2d4e21360d..dc96fc77cd 100644
--- a/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-fe/templates/deployment.yaml
@@ -36,7 +36,11 @@ spec:
         - /root/ready.py
         args:
         - --container-name
+        - "sdc-kb"
+        - --container-name
         - "sdc-be"
+        - --container-name
+        - "sdc-onboarding-be"
         env:
         - name: NAMESPACE
           valueFrom:
@@ -45,15 +49,27 @@ spec:
               fieldPath: metadata.namespace
         image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+      - name: {{ include "common.name" . }}-job-completion
+        image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+        imagePullPolicy: "{{ .Values.global.pullPolicy | default .Values.pullPolicy }}"
+        command:
+        - /root/job_complete.py
+        args:
+        - --job-name
+        - {{ .Release.Name }}-sdc-be-config-backend
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
       containers:
         - name: {{ include "common.name" . }}
-          image: "{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}"
+          image: "{{ include "common.repository" . }}/{{ .Values.image }}"
           imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
           ports:
           - containerPort: {{ .Values.service.internalPort }}
           - containerPort: {{ .Values.service.internalPort2 }}
-          # disable liveness probe when breakpoints set in debugger
-          # so K8s doesn't restart unresponsive container
           {{ if eq .Values.liveness.enabled true }}
           livenessProbe:
             tcpSocket:
@@ -85,6 +101,7 @@ spec:
             mountPath: /var/log/onap
           - name: {{ include "common.fullname" . }}-logback
             mountPath: /tmp/logback.xml
+            subPath: logback.xml
           lifecycle:
             postStart:
               exec:
-- 
cgit 1.2.3-korg