commit 9e2ca9d308d9b5ad0005259c4a2480cd824ec0a8
author Sylvain Desbureaux <sylvain.desbureaux@orange.com> Mon Jan 11 08:15:10 2021 +0000
committer Sylvain Desbureaux <sylvain.desbureaux@orange.com> Fri Jan 15 12:40:53 2021 +0000
tree ab14cb8ad71cdd8e5d2e54c7aa1232c9b3bb7086
parent 0422de8134484d59031bf3113a3ac03e86627fac

[AAF] Externalizes init data out from aaf-cass

Instead of keep initialization data into the docker image, we move them
to the chart.
This will simplify adding / removing certificates as no image release
will be necessary, but only a change in OOM which can be directly
tested.

This reverts commit aa950d2ea4afa900c69eb622a776c8830a1c4e33.
Reason for revert: Changed the initial commit in order to make it really
work.

Issue-ID: OOM-2586
Change-Id: I1091d8940a8499503c72bd92ded9a54f08091ee3
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>

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 461553c..e62d387 100644
--- a/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
+++ b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml
@@ -31,13 +31,35 @@
         args:
         - -c
         - |
-          chown -R 1000:1000 /opt/app/aaf/status
+          echo "*** input data ***"
+          ls -l /config-input-data/*
+          echo "*** input dats ***"
+          ls -l /config-input-dats/*
+          cp -L /config-input-data/* /config-data/
+          cp -L /config-input-dats/* /config-dats/
+          echo "*** output data ***"
+          ls -l /config-data/*
+          echo "*** output dats ***"
+          ls -l /config-dats/*
+          chown -R 1000:1000 /config-data
+          chown -R 1000:1000 /config-dats
           chown -R 1000:1000 /var/lib/cassandra
+          chown -R 1000:1000 /status
         image: {{ include "repositoryGenerator.image.busybox" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         volumeMounts:
           - mountPath: /var/lib/cassandra
             name: aaf-cass-vol
+          - mountPath: /config-input-data
+            name: config-cass-init-data
+          - mountPath: /config-input-dats
+            name: config-cass-init-dats
+          - mountPath: /config-dats
+            name: config-cass-dats
+          - mountPath: /config-data
+            name: config-cass-data
+          - mountPath: /status
+            name: aaf-status
         resources:
           limits:
             cpu: 100m
@@ -81,6 +103,12 @@
         - mountPath: /etc/localtime
           name: localtime
           readOnly: true
+        - mountPath: /opt/app/aaf/cass_init/data
+          name: config-cass-data
+        - mountPath: /opt/app/aaf/cass_init/dats
+          name: config-cass-dats
+        - mountPath: /opt/app/aaf/status
+          name: aaf-status
         {{- if eq .Values.liveness.enabled true }}
         livenessProbe:
           tcpSocket:
@@ -104,6 +132,8 @@
       - name: localtime
         hostPath:
           path: /etc/localtime
+      - name: aaf-status
+        emptyDir: {}
       - name: aaf-cass-vol
       {{- if .Values.persistence.enabled }}
         persistentVolumeClaim:
@@ -111,5 +141,15 @@
       {{- 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
+      - name: config-cass-dats
+        emptyDir: {}
+      - name: config-cass-data
+        emptyDir: {}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"