diff options
author | 2019-09-28 00:05:44 +0530 | |
---|---|---|
committer | 2019-10-08 12:43:55 +0000 | |
commit | 15f4526ce3bd81e8e6741bef96dfb26671e0f67a (patch) | |
tree | 2fefafe0ab3589728b5ba13c4ad52a5219d5a566 /components/aai-elasticsearch/templates | |
parent | d68960684392a6da61805e4161ae032549db6102 (diff) |
[AAI-2617] Search guard is no longer available5.1.0-ONAP5.0.2-ONAP5.0.1-ONAP
Change-Id: I5cc786073ac27d3d36d05f0aa89ac5b7f1aadc02
Signed-off-by: rajeevme<rajeev.mehta@amdocs.com>
Change-Id: I6b8ce9867d8b1d8108fcd7002e84f798a5b4e8e2
(cherry picked from commit 360d63a7609c566a6b8043a7de70ae35bd1f258a)
Diffstat (limited to 'components/aai-elasticsearch/templates')
-rw-r--r-- | components/aai-elasticsearch/templates/configmap.yaml | 26 | ||||
-rw-r--r-- | components/aai-elasticsearch/templates/deployment.yaml | 27 | ||||
-rw-r--r-- | components/aai-elasticsearch/templates/secrets.yaml | 22 |
3 files changed, 2 insertions, 73 deletions
diff --git a/components/aai-elasticsearch/templates/configmap.yaml b/components/aai-elasticsearch/templates/configmap.yaml index 4be124f..5067c83 100644 --- a/components/aai-elasticsearch/templates/configmap.yaml +++ b/components/aai-elasticsearch/templates/configmap.yaml @@ -24,29 +24,3 @@ metadata: heritage: {{ .Release.Service }} data: {{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-sg-scripts - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/bin/*").AsConfig . | indent 2 }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: {{ include "common.fullname" . }}-sg-config - namespace: {{ include "common.namespace" . }} - labels: - app: {{ include "common.name" . }} - chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} -data: -{{ tpl (.Files.Glob "resources/config/sg/*").AsConfig . | indent 2 }} diff --git a/components/aai-elasticsearch/templates/deployment.yaml b/components/aai-elasticsearch/templates/deployment.yaml index 785693a..0c54738 100644 --- a/components/aai-elasticsearch/templates/deployment.yaml +++ b/components/aai-elasticsearch/templates/deployment.yaml @@ -60,8 +60,8 @@ spec: - name: elasticsearch-data mountPath: /logroot/ containers: - - name: {{ include "common.name" . }} - image: "{{ include "common.repository" . }}/{{ .Values.image }}" + - name: {{ include "common.name" . }} + image: "{{ .Values.global.loggingRepository }}/{{ .Values.image }}" imagePullPolicy: {{ .Values.pullPolicy | default .Values.global.pullPolicy }} ports: - containerPort: {{ .Values.service.internalPort }} @@ -93,19 +93,6 @@ spec: - name: elasticsearch-config subPath: log4j2.properties mountPath: /usr/share/elasticsearch/config/log4j2.properties - - name: searchguard-scripts - subPath: run.sh - mountPath: /usr/share/elasticsearch/bin/run.sh - - name: searchguard-scripts - subPath: wait_until_started.sh - mountPath: /usr/share/elasticsearch/bin/wait_until_started.sh - - name: searchguard-scripts - subPath: init_sg.sh - mountPath: /usr/share/elasticsearch/bin/init_sg.sh - - name: searchguard-config - mountPath: /usr/share/elasticsearch/config/sg - - name: searchguard-auth-config - mountPath: /usr/share/elasticsearch/config/sg/auth - name: elasticsearch-data mountPath: /usr/share/elasticsearch/data resources: @@ -126,16 +113,6 @@ spec: - name: elasticsearch-config configMap: name: {{ include "common.fullname" . }}-es-config - - name: searchguard-scripts - configMap: - name: {{ include "common.fullname" . }}-sg-scripts - defaultMode: 0754 - - name: searchguard-config - configMap: - name: {{ include "common.fullname" . }}-sg-config - - name: searchguard-auth-config - secret: - secretName: {{ include "common.fullname" . }}-sg-auth - name: elasticsearch-data hostPath: path: {{ .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPath }} diff --git a/components/aai-elasticsearch/templates/secrets.yaml b/components/aai-elasticsearch/templates/secrets.yaml deleted file mode 100644 index 34b272f..0000000 --- a/components/aai-elasticsearch/templates/secrets.yaml +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright © 2018 Amdocs, Bell Canada, AT&T -# -# 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: Secret -metadata: - name: {{ include "common.fullname" . }}-sg-auth - namespace: {{ include "common.namespace" . }} -type: Opaque -data: -{{ tpl (.Files.Glob "resources/config/sg/auth/*").AsSecrets . | indent 2 }}
\ No newline at end of file |