From 9107fc88ebdfdadef3d7ef49add3aeac10011dd8 Mon Sep 17 00:00:00 2001 From: Simon Tesar Date: Tue, 20 Feb 2018 02:29:37 +0100 Subject: [PATCH] Add initialDelaySeconds and periodSeconds to Logstash livenessProbe, update image (#3651) * Add livenessProbe delay and period * Update to newest image * Raise chart version * add redinessProbe initialDelaySeconds --- incubator/logstash/Chart.yaml | 4 +- incubator/logstash/README.md | 48 +++++++++++--------- incubator/logstash/templates/deployment.yaml | 3 ++ incubator/logstash/values.yaml | 8 +++- 4 files changed, 38 insertions(+), 25 deletions(-) diff --git a/incubator/logstash/Chart.yaml b/incubator/logstash/Chart.yaml index 0810c2b657..333ce08d66 100644 --- a/incubator/logstash/Chart.yaml +++ b/incubator/logstash/Chart.yaml @@ -3,8 +3,8 @@ description: Logstash is an open source, server-side data processing pipeline icon: https://www.elastic.co/assets/blt86e4472872eed314/logo-elastic-logstash-lt.svg home: https://www.elastic.co/products/logstash name: logstash -version: 0.4.0 -appVersion: 6.0.0 +version: 0.5.0 +appVersion: 6.2.1 sources: - https://www.docker.elastic.co - https://www.elastic.co/guide/en/logstash/current/index.html diff --git a/incubator/logstash/README.md b/incubator/logstash/README.md index 73e000b47d..e2b0f165f6 100644 --- a/incubator/logstash/README.md +++ b/incubator/logstash/README.md @@ -31,25 +31,29 @@ chart and deletes the release. The following tables lists the configurable parameters of the drone charts and their default values. -| Parameter | Description | Default | -| ---------------------- | -------------------------------------------------- | ------------------------------------------------ | -| `replicaCount` | Number of replicas | `1` | -| `nodeSelector` | Node selectors | `{}` | -| `image.repository` | Container image name | `docker.elastic.co/logstash/logstash-oss` | -| `image.tag` | Container image tag | `6.0.0` | -| `image.pullPolicy` | Container image pull policy | `IfNotPresent` | -| `service.type` | Service type (ClusterIP, NodePort or LoadBalancer) | `ClusterIP` | -| `service.internalPort` | Logstash internal port | `1514` | -| `service.ports` | Service open ports | `[TCP/1514, UDP/1514, TCP/5044]` | -| `ingress.enabled` | Enables Ingress | `false` | -| `ingress.annotations` | Ingress annotations | `{}` | -| `ingress.hosts` | Ingress accepted hostnames | `[]` | -| `ingress.tls` | Ingress TLS configuration | `nil` | -| `resources` | Pod resource requests & limits | `{}` | -| `elasticsearch.host` | ElasticSearch hostname | `elasticsearch-client.default.svc.cluster.local` | -| `elasticsearch.port` | ElasticSearch port | `9200` | -| `configData` | Extra logstash config | `{}` | -| `patterns` | Logstash patterns configuration | `nil` | -| `inputs` | Logstash inputs configuration | `(basic)` | -| `filters` | Logstash filters configuration | `nil` | -| `outputs` | Logstash outputs configuration | `(basic)` | +| Parameter | Description | Default | +| ----------------------------------- | -------------------------------------------------- | ------------------------------------------------ | +| `replicaCount` | Number of replicas | `1` | +| `nodeSelector` | Node selectors | `{}` | +| `livenessProbe.initialDelaySeconds` | initialDelaySeconds of Pod livenessProbe | `60` | +| `livenessProbe.periodSeconds` | periodSeconds of Pod livenessProbe | `20` | +| `readinessProbe.initialDelaySeconds` | initialDelaySeconds of Pod readinessProbe | `60` | +| `nodeSelector` | Node selectors | `{}` | +| `image.repository` | Container image name | `docker.elastic.co/logstash/logstash-oss` | +| `image.tag` | Container image tag | `6.2.1` | +| `image.pullPolicy` | Container image pull policy | `IfNotPresent` | +| `service.type` | Service type (ClusterIP, NodePort or LoadBalancer) | `ClusterIP` | +| `service.internalPort` | Logstash internal port | `1514` | +| `service.ports` | Service open ports | `[TCP/1514, UDP/1514, TCP/5044]` | +| `ingress.enabled` | Enables Ingress | `false` | +| `ingress.annotations` | Ingress annotations | `{}` | +| `ingress.hosts` | Ingress accepted hostnames | `[]` | +| `ingress.tls` | Ingress TLS configuration | `nil` | +| `resources` | Pod resource requests & limits | `{}` | +| `elasticsearch.host` | ElasticSearch hostname | `elasticsearch-client.default.svc.cluster.local` | +| `elasticsearch.port` | ElasticSearch port | `9200` | +| `configData` | Extra logstash config | `{}` | +| `patterns` | Logstash patterns configuration | `nil` | +| `inputs` | Logstash inputs configuration | `(basic)` | +| `filters` | Logstash filters configuration | `nil` | +| `outputs` | Logstash outputs configuration | `(basic)` | diff --git a/incubator/logstash/templates/deployment.yaml b/incubator/logstash/templates/deployment.yaml index 640c9dc013..fcac1452a1 100644 --- a/incubator/logstash/templates/deployment.yaml +++ b/incubator/logstash/templates/deployment.yaml @@ -28,9 +28,12 @@ spec: livenessProbe: tcpSocket: port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} + periodSeconds: {{ .Values.livenessProbe.periodSeconds }} readinessProbe: tcpSocket: port: {{ .Values.service.internalPort }} + initialDelaySeconds: {{ .Values.readinessProbe.initialDelaySeconds }} env: - name: ELASTICSEARCH_HOST value: {{ .Values.elasticsearch.host | quote }} diff --git a/incubator/logstash/values.yaml b/incubator/logstash/values.yaml index f9a41bdb04..718a0cba6c 100644 --- a/incubator/logstash/values.yaml +++ b/incubator/logstash/values.yaml @@ -5,7 +5,7 @@ replicaCount: 1 nodeSelector: {} image: repository: docker.elastic.co/logstash/logstash-oss - tag: 6.0.0 + tag: 6.2.1 pullPolicy: IfNotPresent service: type: ClusterIP @@ -24,6 +24,12 @@ service: # Extra config options configData: {} +livenessProbe: + initialDelaySeconds: 60 + periodSeconds: 20 +readinessProbe: + initialDelaySeconds: 120 + ingress: enabled: false # Used to create an Ingress and Service record.