summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Wozniak <jwozniak@redhat.com>2017-07-26 13:40:49 +0200
committerJan Wozniak <jwozniak@redhat.com>2017-08-29 11:42:36 +0200
commit7c237bd18221e87dbd5d11207554d64d558377af (patch)
treee90faff89eb19011add607094f34a83779420bf1
parentbe421d6e18c9be5354154030f91928bce775126d (diff)
downloadopenshift-7c237bd18221e87dbd5d11207554d64d558377af.tar.gz
openshift-7c237bd18221e87dbd5d11207554d64d558377af.tar.bz2
openshift-7c237bd18221e87dbd5d11207554d64d558377af.tar.xz
openshift-7c237bd18221e87dbd5d11207554d64d558377af.zip
elasticsearch: reintroduce readiness probe
-rw-r--r--roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j23
-rw-r--r--roles/openshift_logging_elasticsearch/templates/es.j213
2 files changed, 15 insertions, 1 deletions
diff --git a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2 b/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
index 0c06a7677..65b08d970 100644
--- a/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
+++ b/roles/openshift_logging_elasticsearch/templates/elasticsearch.yml.j2
@@ -24,7 +24,8 @@ network:
cloud:
kubernetes:
- service: ${SERVICE_DNS}
+ pod_label: ${POD_LABEL}
+ pod_port: 9300
namespace: ${NAMESPACE}
discovery:
diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2
index cbe6b89f2..8ff2ecc32 100644
--- a/roles/openshift_logging_elasticsearch/templates/es.j2
+++ b/roles/openshift_logging_elasticsearch/templates/es.j2
@@ -90,6 +90,12 @@ spec:
name: "RECOVER_AFTER_TIME"
value: "{{openshift_logging_elasticsearch_recover_after_time}}"
-
+ name: "READINESS_PROBE_TIMEOUT"
+ value: "30"
+ -
+ name: "POD_LABEL"
+ value: "component={{component}}"
+ -
name: "IS_MASTER"
value: "{% if deploy_type in ['data-master', 'master'] %}true{% else %}false{% endif %}"
@@ -106,6 +112,13 @@ spec:
readOnly: true
- name: elasticsearch-storage
mountPath: /elasticsearch/persistent
+ readinessProbe:
+ exec:
+ command:
+ - "/usr/share/java/elasticsearch/probe/readiness.sh"
+ initialDelaySeconds: 10
+ timeoutSeconds: 30
+ periodSeconds: 5
volumes:
- name: elasticsearch
secret: