Merge "[AAF] Uses new tpls for repos / images"

[oom.git] / kubernetes / aaf / components / aaf-cass / templates / deployment.yaml

diff --git a/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
index 309a9f3..4dc508f 100644 (file)
--- a/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
+++ b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
@@ -1,3 +1,4 @@
+{{/*
 # Copyright © 2017 Amdocs, Bell Canada
 # Modifications © 2020 Orange
 #
@@ -12,6 +13,7 @@
 # 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.
+*/}}
 
 apiVersion: apps/v1
 kind: Deployment
@@ -31,7 +33,7 @@ spec:
         - |
           chown -R 1000:1000 /opt/app/aaf/status
           chown -R 1000:1000 /var/lib/cassandra
-        image: "{{ .Values.global.busyboxRepository }}/{{ .Values.global.busyboxImage }}"
+        image: {{ include "repositoryGenerator.image.busybox" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
           - mountPath: /var/lib/cassandra
@@ -45,7 +47,7 @@ spec:
             memory: 100Mi
       containers:
       - name: {{ include "common.name" . }}
-        image: {{ include "common.repository" . }}/{{ .Values.image }}
+        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         # installing with cmd "onap" will not only initialize the DB, but add ONAP bootstrap data as well
         command: ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh","onap"]
@@ -79,6 +81,10 @@ spec:
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
+        - mountPath: /opt/app/aaf/cass_init/data
+          name: config-cass-init-data
+        - mountPath: /opt/app/aaf/cass_init/dats
+          name: config-cass-init-dats
         {{- if eq .Values.liveness.enabled true }}
         livenessProbe:
           tcpSocket:
@@ -109,5 +115,11 @@ spec:
       {{- else }}
         emptyDir: {}
       {{- end }}
+      - name: config-cass-init-dats
+        configMap:
+          name: {{ include "common.fullname" . }}-cass-init-dats
+      - name: config-cass-init-data
+        configMap:
+          name: {{ include "common.fullname" . }}-cass-init-data
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"