diff options
author | 2020-05-27 07:40:56 +0000 | |
---|---|---|
committer | 2020-05-27 07:40:56 +0000 | |
commit | 100f28ca0b9406b7007f03cb182075ab797e04cb (patch) | |
tree | 8339815f9a6dfbf1f2eb30bd7a2673fbca05d226 /kubernetes/common/elasticsearch/templates | |
parent | 622bf4cb9594bc3d0e44156dd5cb2b04cc89e658 (diff) | |
parent | c6152ced0f67d3880211929835dacb13f2a7a30c (diff) |
Merge "[COMMON] Use common aaf template in elasticsearch"
Diffstat (limited to 'kubernetes/common/elasticsearch/templates')
-rw-r--r-- | kubernetes/common/elasticsearch/templates/configmap-aaf-add-config.yaml | 33 | ||||
-rw-r--r-- | kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml | 7 |
2 files changed, 3 insertions, 37 deletions
diff --git a/kubernetes/common/elasticsearch/templates/configmap-aaf-add-config.yaml b/kubernetes/common/elasticsearch/templates/configmap-aaf-add-config.yaml deleted file mode 100644 index b4e0044891..0000000000 --- a/kubernetes/common/elasticsearch/templates/configmap-aaf-add-config.yaml +++ /dev/null @@ -1,33 +0,0 @@ - -{{ if .Values.global.aafEnabled }} -{{/* -# Copyright © 2020 Bitnami, AT&T, Amdocs, Bell Canada, highstreet technologies -# -# 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. -*/}} -{{- if .Values.aafConfig.addconfig -}} -apiVersion: v1 -kind: ConfigMap -{{ $suffix := "aaf-add-config" -}} -metadata: {{- include "common.resourceMetadata" (dict "suffix" $suffix "dot" . )| nindent 2 }} -data: - aaf-add-config.sh: |- - cd /opt/app/osaaf/local - mkdir -p certs - export $(/opt/app/aaf_config/bin/agent.sh local showpass | grep '^c' | xargs -0) - keytool -exportcert -rfc -file certs/cacert.pem -keystore {{ .Values.aafConfig.fqi_namespace }}.trust.jks -alias ca_local_0 -storepass $cadi_truststore_password - openssl pkcs12 -in {{ .Values.aafConfig.fqi_namespace }}.p12 -out certs/cert.pem -passin pass:$cadi_keystore_password_p12 -passout pass:$cadi_keystore_password_p12 - cp {{ .Values.aafConfig.fqi_namespace }}.key certs/key.pem - chmod -R 755 certs -{{- end -}} -{{- end -}} diff --git a/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml b/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml index 65a7f462e1..1ab5b59855 100644 --- a/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml +++ b/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml @@ -61,7 +61,7 @@ spec: securityContext: privileged: true {{- end }} - {{ include "common.aaf-config" . | nindent 8}} + {{ include "common.certInitializer.initContainer" . | nindent 8 }} containers: - name: {{ include "common.name" . }}-nginx @@ -82,7 +82,7 @@ spec: - name: nginx-server-block mountPath: /opt/bitnami/nginx/conf/server_blocks {{- end }} - {{- include "common.aaf-config-volume-mountpath" . | nindent 10 }} + {{- include "common.certInitializer.volumeMount" . | nindent 10 }} - name: {{ include "common.name" . }}-elasticsearch image: {{ printf "%s/%s:%s" (include "common.repository" .) .Values.image.imageName .Values.image.tag }} @@ -163,5 +163,4 @@ spec: configMap: name: {{ include "common.fullname" . }}-nginx-server-block {{- end }} - {{- include "common.aaf-config-volumes" . | nindent 8}} - + {{ include "common.certInitializer.volumes" . | nindent 8 }} |