From 403c1c1851dd17f0b77386eb8422796cb46a8dae Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Thu, 19 Apr 2018 23:15:43 +0000
Subject: fixing sdc health check

-Basically compared docker_run.sh from sdc master branch
 with charts/values in OOM
-disabling sdc-kb liveness until we tune the timing of it

Issue-ID: OOM-964

Change-Id: I7447eed47c919d5d64786f45e01b5f2a3bc490a0
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
---
 .../sdc/charts/sdc-be/templates/deployment.yaml    | 38 ++++++++++++----------
 kubernetes/sdc/charts/sdc-be/templates/job.yaml    |  4 +++
 kubernetes/sdc/charts/sdc-be/values.yaml           |  4 +++
 3 files changed, 28 insertions(+), 18 deletions(-)

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

diff --git a/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml b/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml
index 4a08504575..d0b8eae768 100644
--- a/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml
+++ b/kubernetes/sdc/charts/sdc-be/templates/deployment.yaml
@@ -86,7 +86,9 @@ spec:
           - name: ENVNAME
             value: {{ .Values.global.env.name }}
           - name: JAVA_OPTIONS
-            value: ""
+            value: {{ .Values.config.javaOptions }}
+          - name: cassandra_ssl_enabled
+            value: {{ .Values.config.cassandraSslEnabled | quote }}
           - name: HOST_IP
             valueFrom:
               fieldRef:
@@ -129,22 +131,22 @@ spec:
           - name: {{ include "common.fullname" . }}-data-filebeat
             mountPath: /usr/share/filebeat/data
       volumes:
-        - name: {{ include "common.fullname" . }}-localtime
-          hostPath:
-            path: /etc/localtime
-        - name: {{ include "common.fullname" . }}-filebeat-conf
-          configMap:
-           name: {{ .Release.Name }}-sdc-filebeat-configmap
-        - name: {{ include "common.fullname" . }}-data-filebeat
-          emptyDir: {}
-        - name: {{ include "common.fullname" . }}-logback
-          configMap:
-            name : {{ include "common.fullname" . }}-logging-configmap
-        - name: {{ include "common.fullname" . }}-environments
-          configMap:
-            name: {{ .Release.Name }}-sdc-environments-configmap
-            defaultMode: 0755
-        - name:  {{ include "common.fullname" . }}-logs
-          emptyDir: {}
+      - name: {{ include "common.fullname" . }}-localtime
+        hostPath:
+          path: /etc/localtime
+      - name: {{ include "common.fullname" . }}-filebeat-conf
+        configMap:
+          name: {{ .Release.Name }}-sdc-filebeat-configmap
+      - name: {{ include "common.fullname" . }}-data-filebeat
+        emptyDir: {}
+      - name: {{ include "common.fullname" . }}-logback
+        configMap:
+          name : {{ include "common.fullname" . }}-logging-configmap
+      - name: {{ include "common.fullname" . }}-environments
+        configMap:
+          name: {{ .Release.Name }}-sdc-environments-configmap
+          defaultMode: 0755
+      - name:  {{ include "common.fullname" . }}-logs
+        emptyDir: {}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"
\ No newline at end of file
diff --git a/kubernetes/sdc/charts/sdc-be/templates/job.yaml b/kubernetes/sdc/charts/sdc-be/templates/job.yaml
index e4f3807cf8..d40ef115b3 100644
--- a/kubernetes/sdc/charts/sdc-be/templates/job.yaml
+++ b/kubernetes/sdc/charts/sdc-be/templates/job.yaml
@@ -55,6 +55,10 @@ spec:
         env:
         - name: ENVNAME
           value: {{ .Values.global.env.name }}
+        - name: HOST_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP
       volumes:
         - name: {{ include "common.fullname" . }}-environments
           configMap:
diff --git a/kubernetes/sdc/charts/sdc-be/values.yaml b/kubernetes/sdc/charts/sdc-be/values.yaml
index 614ead4f0c..ad63ad8e60 100644
--- a/kubernetes/sdc/charts/sdc-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-be/values.yaml
@@ -35,6 +35,10 @@ pullPolicy: Always
 # flag to enable debugging - application support required
 debugEnabled: false
 
+config:
+  javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=4000,server=y,suspend=n -Xmx1536m -Xms1536m"
+  cassandraSslEnabled: "false"
+
 # default number of instances
 replicaCount: 1
 
-- 
cgit 1.2.3-korg