diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-04-11 01:45:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-04-11 01:45:36 +0000 |
| commit | 59c67ecb895ecab09c994d8966394e6e36fff74b (patch) | |
| tree | e46d6de6098f9a1f23cd53282e887d712c9433df | |
| parent | 272df57929654b7b2bf45ce92eddf7eaef8f3923 (diff) | |
| parent | 457c65a00d9487ace9afb4634278cd9661a7e77c (diff) | |
Merge "OOM-871 log kibana container fails to start"
| -rw-r--r-- | kubernetes/log/charts/log-kibana/templates/deployment.yaml | 11 | ||||
| -rw-r--r-- | kubernetes/log/charts/log-kibana/values.yaml | 4 |
2 files changed, 10 insertions, 5 deletions
diff --git a/kubernetes/log/charts/log-kibana/templates/deployment.yaml b/kubernetes/log/charts/log-kibana/templates/deployment.yaml index bdd5a447be..09dc88fb20 100644 --- a/kubernetes/log/charts/log-kibana/templates/deployment.yaml +++ b/kubernetes/log/charts/log-kibana/templates/deployment.yaml @@ -53,27 +53,30 @@ spec: - containerPort: {{ .Values.service.internalPort }} name: {{ .Values.service.name }} readinessProbe: - tcpSocket: + httpGet: + path: "/" port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }} periodSeconds: {{ .Values.readiness.periodSeconds }} + timeoutSeconds: {{ .Values.readiness.timeoutSeconds }} # disable liveness probe when breakpoints set in debugger # so K8s doesn't restart unresponsive container {{- if eq .Values.liveness.enabled true }} livenessProbe: - tcpSocket: + httpGet: + path: "/" port: {{ .Values.service.internalPort }} initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }} periodSeconds: {{ .Values.liveness.periodSeconds }} + timeoutSeconds: {{ .Values.liveness.timeoutSeconds }} {{ end -}} env: volumeMounts: - mountPath: /etc/localtime name: localtime readOnly: true - - mountPath: /usr/share/kibana/config/kibana.yml + - mountPath: /usr/share/kibana/config/ name: {{ include "common.fullname" . }} - subPath: kibana.yml resources: {{ toYaml .Values.resources | indent 12 }} {{- if .Values.nodeSelector }} diff --git a/kubernetes/log/charts/log-kibana/values.yaml b/kubernetes/log/charts/log-kibana/values.yaml index d51f3c296c..b09f91ac62 100644 --- a/kubernetes/log/charts/log-kibana/values.yaml +++ b/kubernetes/log/charts/log-kibana/values.yaml @@ -54,13 +54,15 @@ affinity: {} liveness: initialDelaySeconds: 180 periodSeconds: 10 + timeoutSeconds: 1 # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true readiness: - initialDelaySeconds: 10 + initialDelaySeconds: 180 periodSeconds: 10 + timeoutSeconds: 1 service: #Example service definition with external, internal and node ports. |