From 35f83f5ba9cf0e7053160710fa18d73156bdba66 Mon Sep 17 00:00:00 2001
From: Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com>
Date: Wed, 20 Mar 2019 10:42:49 +0000
Subject: Upgrade SDC to use common Cassandra Cluster

Change-Id: I2ea2841c6902b786446c7bc850183fa21552214a
Issue-ID: OOM-1203
Signed-off-by: Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com>
---
 kubernetes/sdc/charts/sdc-cs/templates/job.yaml | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'kubernetes/sdc/charts/sdc-cs/templates/job.yaml')

diff --git a/kubernetes/sdc/charts/sdc-cs/templates/job.yaml b/kubernetes/sdc/charts/sdc-cs/templates/job.yaml
index 75e9a11a03..856aecc63b 100644
--- a/kubernetes/sdc/charts/sdc-cs/templates/job.yaml
+++ b/kubernetes/sdc/charts/sdc-cs/templates/job.yaml
@@ -40,7 +40,11 @@ spec:
         - /root/ready.py
         args:
         - --container-name
+        {{- if .Values.global.cassandra.localCluster }}
         - sdc-cs
+        {{- else }}
+        - cassandra
+        {{- end }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -54,8 +58,6 @@ spec:
         volumeMounts:
         - name: {{ include "common.fullname" . }}-environments
           mountPath: /root/chef-solo/environments/
-        - name: {{ include "common.fullname" . }}-data
-          mountPath: /var/lib/cassandra/
         - name: {{ include "common.fullname" . }}-chef-cache
           mountPath: /root/chef-solo/cache
         env:
@@ -81,13 +83,6 @@ spec:
         configMap:
           name: {{ .Release.Name }}-sdc-environments-configmap
           defaultMode: 0755
-      - name: {{ include "common.fullname" . }}-data
-      {{- if .Values.persistence.enabled }}
-        persistentVolumeClaim:
-          claimName: {{ include "common.fullname" . }}
-      {{- else }}
-        emptyDir: {}
-      {{- end }}
       - name: {{ include "common.fullname" . }}-chef-cache
         emptyDir: {}
       imagePullSecrets:
-- 
cgit 1.2.3-korg