diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-27 10:51:31 +0000 |
|---|---|---|
| committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-11-27 10:51:31 +0000 |
| commit | aa950d2ea4afa900c69eb622a776c8830a1c4e33 (patch) | |
| tree | 7a4d009cd104c39d4fcc9ea03b6c1d3cdda6f851 /kubernetes/aaf/components/aaf-templates | |
| parent | a8c57a9bdb75a6778cae512ae83710ad8af361e4 (diff) | |
Revert "[AAF] externalizes init data out from aaf-cass image to chart"
This reverts commit a8c57a9bdb75a6778cae512ae83710ad8af361e4.
Reason for revert: AAF on master is broken
Issue-ID: OOM-2586
Change-Id: I0c1cfb2c7be0a8884ca003523d847c3cf0c3ab20
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.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/kubernetes/aaf/components/aaf-templates/requirements.yaml b/kubernetes/aaf/components/aaf-templates/requirements.yaml index 45f878114f..6afaa06e8a 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 00b44a0455..bf6931a8e3 100644 --- a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl +++ b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl @@ -37,9 +37,6 @@ 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: @@ -65,9 +62,6 @@ 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 -}} |