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 "Added fix for OOM-1966"
[oom.git]
/
kubernetes
/
clamp
/
charts
/
clamp-dash-kibana
/
templates
/
deployment.yaml
diff --git
a/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
b/kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
index
2b0adac
..
26547b2
100644
(file)
--- a/
kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
+++ b/
kubernetes/clamp/charts/clamp-dash-kibana/templates/deployment.yaml
@@
-68,6
+68,8
@@
spec:
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end -}}
env:
periodSeconds: {{ .Values.liveness.periodSeconds }}
{{ end -}}
env:
+ - name: elasticsearch_base_url
+ value: "{{ternary "https" "http" .Values.security.ssl.enabled}}://{{.Values.config.elasticsearchServiceName}}.{{.Release.Namespace}}.svc.cluster.local:{{.Values.config.elasticsearchPort}}"
volumeMounts:
- mountPath: /etc/localtime
name: localtime
volumeMounts:
- mountPath: /etc/localtime
name: localtime
@@
-75,8
+77,6
@@
spec:
- mountPath: /usr/share/kibana/config/kibana.yml
name: {{ include "common.fullname" . }}
subPath: kibana.yml
- mountPath: /usr/share/kibana/config/kibana.yml
name: {{ include "common.fullname" . }}
subPath: kibana.yml
- - name: {{ include "common.fullname" . }}-aaf-pem-certs
- mountPath: /usr/share/kibana/config/keystore/
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
resources:
{{ include "common.resources" . | indent 12 }}
{{- if .Values.nodeSelector }}
@@
-97,8
+97,5
@@
spec:
items:
- key: kibana.yml
path: kibana.yml
items:
- key: kibana.yml
path: kibana.yml
- - name: {{ include "common.fullname" . }}-aaf-pem-certs
- secret:
- secretName: {{ include "common.fullname" . }}-aaf-pem-keys
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"
imagePullSecrets:
- name: "{{ include "common.namespace" . }}-docker-registry-key"