Merge "Revert "basic auth for so-monitoring""

[oom.git] / kubernetes / portal / charts / portal-cassandra / templates / deployment.yaml

diff --git a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
index 6f3f23f..96e865d 100644 (file)
--- a/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
+++ b/kubernetes/portal/charts/portal-cassandra/templates/deployment.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright © 2018 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -64,7 +65,7 @@ spec:
           - name: CASSPASS
             value: "{{ .Values.config.cassandraPassword }}"
           - name: JVM_OPTS
-            value: "{{ .Values.config.cassandraJvmOpts }}"  
+            value: "{{ .Values.config.cassandraJvmOpts }}"
           - name: POD_IP
             valueFrom:
               fieldRef:
@@ -74,15 +75,12 @@ spec:
           name: localtime
           readOnly: true
         - name: cassandra-docker-entrypoint-initdb
-          mountPath: /docker-entrypoint-initdb.d/zzz_portal.cql
-          subPath: portal.cql
-        - name: cassandra-docker-entrypoint-initdb
-          mountPath: /docker-entrypoint-initdb.d/zzz_portalsdk.cql
-          subPath: portalsdk.cql
+          mountPath: /docker-entrypoint-initdb.d/aaa_portal_single.cql
+          subPath: portal_single.cql
         - name: {{ include "common.fullname" . }}-data
           mountPath: /var/lib/cassandra/data
         resources:
-{{ toYaml .Values.resources | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}