Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "[COMMON/elasticsearch] Avoid 'Warning: Merging destination map for chart'"
[oom.git]
/
kubernetes
/
common
/
elasticsearch
/
templates
/
coordinating-deploy.yaml
diff --git
a/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml
b/kubernetes/common/elasticsearch/templates/coordinating-deploy.yaml
index
65a7f46
..
8ec3862
100644
(file)
--- 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 }}
securityContext:
privileged: true
{{- end }}
- {{ include "common.
aaf-config" . | nindent 8
}}
+ {{ include "common.
certInitializer.initContainer" . | nindent 8
}}
containers:
- name: {{ include "common.name" . }}-nginx
containers:
- name: {{ include "common.name" . }}-nginx
@@
-82,10
+82,10
@@
spec:
- name: nginx-server-block
mountPath: /opt/bitnami/nginx/conf/server_blocks
{{- end }}
- 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
- name: {{ include "common.name" . }}-elasticsearch
- image: {{ printf "%s/%s
:%s" (include "common.repository" .) .Values.image.imageName .Values.image.tag
}}
+ image: {{ printf "%s/%s
" (include "common.repository" .) .Values.image
}}
{{- if .Values.securityContext.enabled }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
securityContext:
{{- if .Values.securityContext.enabled }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
securityContext:
@@
-93,7
+93,7
@@
spec:
{{- end }}
env:
- name: BITNAMI_DEBUG
{{- end }}
env:
- name: BITNAMI_DEBUG
- value: {{ ternary "true" "false" .Values.
image.
debug | quote }}
+ value: {{ ternary "true" "false" .Values.debug | quote }}
- name: ELASTICSEARCH_CLUSTER_NAME
value: {{ include "elasticsearch.clustername" .}}
- name: ELASTICSEARCH_CLUSTER_HOSTS
- name: ELASTICSEARCH_CLUSTER_NAME
value: {{ include "elasticsearch.clustername" .}}
- name: ELASTICSEARCH_CLUSTER_HOSTS
@@
-163,5
+163,4
@@
spec:
configMap:
name: {{ include "common.fullname" . }}-nginx-server-block
{{- end }}
configMap:
name: {{ include "common.fullname" . }}-nginx-server-block
{{- end }}
- {{- include "common.aaf-config-volumes" . | nindent 8}}
-
+ {{ include "common.certInitializer.volumes" . | nindent 8 }}