From 41d2b420a657d4ac1d2b3d0e8288d18e8952d56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20R=C3=BCegg?= Date: Sat, 13 Oct 2018 20:19:59 +0200 Subject: [PATCH] Switch readiness and liveness probes (#8389) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Apparently readiness and liveness probes were mistaken. It probably makes more sense for the liveness probe to have an initial delay of 60 seconds. Also 10s is the default for periodSeconds. Signed-off-by: Simon Rüegg --- stable/grafana/Chart.yaml | 2 +- stable/grafana/README.md | 6 +++--- stable/grafana/values.yaml | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 903c94773e..3479af748d 100755 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,5 +1,5 @@ name: grafana -version: 1.17.0 +version: 1.17.1 appVersion: 5.3.0 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/README.md b/stable/grafana/README.md index 4f47a864f9..6c82b4e67b 100644 --- a/stable/grafana/README.md +++ b/stable/grafana/README.md @@ -33,14 +33,14 @@ The command removes all the Kubernetes components associated with the chart and |---------------------------------|-----------------------------------------------|---------------------------------------------------------| | `replicas` | Number of nodes | `1` | | `deploymentStrategy` | Deployment strategy | `RollingUpdate` | -| `livenessProbe` | Liveness Probe settings | `{ "httpGet": { "path": "/api/health", "port": 3000 } }` | -| `readinessProbe` | Rediness Probe settings | `{ "httpGet": { "path": "/api/health", "port": 3000 } "initialDelaySeconds": 60, "timeoutSeconds": 30, "failureThreshold": 10, "periodSeconds": 10 }` | +| `livenessProbe` | Liveness Probe settings | `{ "httpGet": { "path": "/api/health", "port": 3000 } "initialDelaySeconds": 60, "timeoutSeconds": 30, "failureThreshold": 10 }` | +| `readinessProbe` | Rediness Probe settings | `{ "httpGet": { "path": "/api/health", "port": 3000 } }`| | `securityContext` | Deployment securityContext | `{"runAsUser": 472, "fsGroup": 472}` | | `image.repository` | Image repository | `grafana/grafana` | | `image.tag` | Image tag. (`Must be >= 5.0.0`) | `5.3.0` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `service.type` | Kubernetes service type | `ClusterIP` | -| `service.port` | Kubernetes port where service is exposed | `80` | +| `service.port` | Kubernetes port where service is exposed | `80` | | `service.annotations` | Service annotations | `{}` | | `service.labels` | Custom labels | `{}` | | `ingress.enabled` | Enables Ingress | `false` | diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml index eab892e154..516d6f6194 100644 --- a/stable/grafana/values.yaml +++ b/stable/grafana/values.yaml @@ -9,19 +9,18 @@ replicas: 1 deploymentStrategy: RollingUpdate -livenessProbe: +readinessProbe: httpGet: path: /api/health port: 3000 -readinessProbe: +livenessProbe: httpGet: path: /api/health port: 3000 initialDelaySeconds: 60 timeoutSeconds: 30 failureThreshold: 10 - periodSeconds: 10 image: repository: grafana/grafana