diff options
author | 2020-11-27 10:51:31 +0000 | |
---|---|---|
committer | 2020-11-27 10:51:31 +0000 | |
commit | aa950d2ea4afa900c69eb622a776c8830a1c4e33 (patch) | |
tree | 7a4d009cd104c39d4fcc9ea03b6c1d3cdda6f851 /kubernetes/aaf/components/aaf-cass/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-cass/templates')
-rw-r--r-- | kubernetes/aaf/components/aaf-cass/templates/configmap.yaml | 45 | ||||
-rw-r--r-- | kubernetes/aaf/components/aaf-cass/templates/deployment.yaml | 10 |
2 files changed, 0 insertions, 55 deletions
diff --git a/kubernetes/aaf/components/aaf-cass/templates/configmap.yaml b/kubernetes/aaf/components/aaf-cass/templates/configmap.yaml deleted file mode 100644 index ebf09e75c5..0000000000 --- a/kubernetes/aaf/components/aaf-cass/templates/configmap.yaml +++ /dev/null @@ -1,45 +0,0 @@ -{{/* -# ============LICENSE_START==================================================== -# org.onap.aaf -# =========================================================================== -# Copyright (c) 2020 AT&T Intellectual Property. All rights reserved. -# =========================================================================== -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# 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: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-cass-init-dats - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ include "common.release" . }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/cass-init-dats/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-cass-init-data - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ include "common.release" . }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/cass-init-data/*").AsConfig . | indent 2 }} diff --git a/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml index 30e25269cd..50889561cf 100644 --- a/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml +++ b/kubernetes/aaf/components/aaf-cass/templates/deployment.yaml @@ -81,10 +81,6 @@ 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: @@ -115,11 +111,5 @@ 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" |