From a8c57a9bdb75a6778cae512ae83710ad8af361e4 Mon Sep 17 00:00:00 2001 From: "John J. Franey" Date: Fri, 2 Oct 2020 05:45:05 -0400 Subject: [AAF] externalizes init data out from aaf-cass image to chart The initialization data appear as resources to the chart. The templates were modified to define ConfigMaps and Deployment to mount them to the aaf-cass container when it starts. The existing aaf-cass initialization script in the image will load the database from these files. Issue-ID: OOM-2586 Signed-off-by: John J. Franey Change-Id: I6be0d4c6739cedfbca5df4ddb527eee2583f74a7 Signed-off-by: Sylvain Desbureaux --- kubernetes/aaf/components/aaf-templates/requirements.yaml | 4 ++-- kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'kubernetes/aaf/components/aaf-templates') diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml index 6afaa06e8a..45f878114f 100644 --- a/kubernetes/aaf/components/aaf-templates/requirements.yaml +++ b/kubernetes/aaf/components/aaf-templates/requirements.yaml @@ -1,4 +1,4 @@ - # Copyright © 2020 Orange +# Copyright © 2020 Orange # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. - dependencies: +dependencies: - name: common version: ~6.x-0 repository: '@local' diff --git a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl index bf6931a8e3..00b44a0455 100644 --- a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl +++ b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl @@ -37,6 +37,9 @@ spec: - mountPath: /etc/localtime name: localtime readOnly: true + - mountPath: /opt/app/osaaf/etc/org.osaaf.aaf.log4j.props + name: aaf-log + subPath: org.osaaf.aaf.log4j.props {{- if eq .Values.liveness.enabled true }} livenessProbe: tcpSocket: @@ -62,6 +65,9 @@ spec: path: /etc/localtime - name: aaf-config-vol emptyDir: {} + - name: aaf-log + configMap: + name: {{ include "common.release" . }}-aaf-log imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" {{- end -}} -- cgit 1.2.3-korg