aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aaf/components/aaf-templates
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-01-11 08:15:10 +0000
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-01-15 12:40:53 +0000
commit9e2ca9d308d9b5ad0005259c4a2480cd824ec0a8 (patch)
treeab14cb8ad71cdd8e5d2e54c7aa1232c9b3bb7086 /kubernetes/aaf/components/aaf-templates
parent0422de8134484d59031bf3113a3ac03e86627fac (diff)
[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>
Diffstat (limited to 'kubernetes/aaf/components/aaf-templates')
-rw-r--r--kubernetes/aaf/components/aaf-templates/requirements.yaml4
-rw-r--r--kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl6
2 files changed, 8 insertions, 2 deletions
diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml
index fc2e0ef0b3..d2e48a6625 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: ~7.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 25a05a5e2f..afa5004a48 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 -}}