From 4f56b416c8604608ea4cd7ec5abc8f65e475fa46 Mon Sep 17 00:00:00 2001 From: Carlos Tadeu Panato Junior Date: Thu, 13 Sep 2018 14:11:15 +0200 Subject: [PATCH] Fix statefulset / use the correct endpoint for probes and update minio (#7711) Signed-off-by: cpanato --- stable/minio/Chart.yaml | 4 ++-- stable/minio/README.md | 4 ++-- stable/minio/templates/deployment.yaml | 6 ++++-- stable/minio/templates/service.yaml | 4 ++++ stable/minio/templates/statefulset.yaml | 10 ++-------- stable/minio/values.yaml | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/stable/minio/Chart.yaml b/stable/minio/Chart.yaml index 507bd0d6ac..83c4ec984b 100755 --- a/stable/minio/Chart.yaml +++ b/stable/minio/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 description: Minio is a high performance distributed object storage server, designed for large-scale private cloud infrastructure. name: minio -version: 1.7.0 -appVersion: RELEASE.2018-09-01T00-38-25Z +version: 1.8.0 +appVersion: RELEASE.2018-09-12T18-49-56Z keywords: - storage - object-storage diff --git a/stable/minio/README.md b/stable/minio/README.md index 63f4ac4f8d..ad36e9376a 100644 --- a/stable/minio/README.md +++ b/stable/minio/README.md @@ -76,10 +76,10 @@ The following table lists the configurable parameters of the Minio chart and the | Parameter | Description | Default | |----------------------------|-------------------------------------|---------------------------------------------------------| | `image.repository` | Image repository | `minio/minio` | -| `image.tag` | Minio image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/).| `RELEASE.2018-09-01T00-38-25Z`| +| `image.tag` | Minio image tag. Possible values listed [here](https://hub.docker.com/r/minio/minio/tags/).| `RELEASE.2018-09-12T18-49-56Z`| | `image.pullPolicy` | Image pull policy | `IfNotPresent` | | `mcImage.repository` | Client image repository | `minio/mc` | -| `mcImage.tag` | mc image tag. Possible values listed [here](https://hub.docker.com/r/minio/mc/tags/).| `RELEASE.2018-08-18T02-13-04Z`| +| `mcImage.tag` | mc image tag. Possible values listed [here](https://hub.docker.com/r/minio/mc/tags/).| `RELEASE.2018-09-10T23-39-12Z`| | `mcImage.pullPolicy` | mc Image pull policy | `IfNotPresent` | | `ingress.enabled` | Enables Ingress | `false` | | `ingress.annotations` | Ingress annotations | `{}` | diff --git a/stable/minio/templates/deployment.yaml b/stable/minio/templates/deployment.yaml index ce5042835c..b9f9d35eb7 100644 --- a/stable/minio/templates/deployment.yaml +++ b/stable/minio/templates/deployment.yaml @@ -93,7 +93,8 @@ spec: key: gcs_key.json {{- end }} livenessProbe: - tcpSocket: + httpGet: + path: /minio/health/live port: service initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.livenessProbe.periodSeconds }} @@ -101,7 +102,8 @@ spec: successThreshold: {{ .Values.livenessProbe.successThreshold }} failureThreshold: {{ .Values.livenessProbe.failureThreshold }} readinessProbe: - tcpSocket: + httpGet: + path: /minio/health/ready port: service periodSeconds: {{ .Values.readinessProbe.periodSeconds }} timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} diff --git a/stable/minio/templates/service.yaml b/stable/minio/templates/service.yaml index 1ac8c2282e..0799b287e9 100644 --- a/stable/minio/templates/service.yaml +++ b/stable/minio/templates/service.yaml @@ -13,7 +13,11 @@ metadata: {{- end }} spec: {{- if (or (eq .Values.service.type "ClusterIP" "") (empty .Values.service.type)) }} + {{- if eq .Values.mode "distributed" }} + clusterIP: None + {{- else }} type: ClusterIP + {{- end }} {{- if not (empty .Values.service.clusterIP) }} clusterIP: {{ .Values.service.clusterIP }} {{end}} diff --git a/stable/minio/templates/statefulset.yaml b/stable/minio/templates/statefulset.yaml index f690abd0f8..b8abea3b6a 100644 --- a/stable/minio/templates/statefulset.yaml +++ b/stable/minio/templates/statefulset.yaml @@ -63,20 +63,14 @@ spec: name: {{ template "minio.fullname" . }} key: secretkey livenessProbe: - tcpSocket: + httpGet: + path: /minio/health/live port: service initialDelaySeconds: {{ .Values.livenessProbe.initialDelaySeconds }} periodSeconds: {{ .Values.livenessProbe.periodSeconds }} timeoutSeconds: {{ .Values.livenessProbe.timeoutSeconds }} successThreshold: {{ .Values.livenessProbe.successThreshold }} failureThreshold: {{ .Values.livenessProbe.failureThreshold }} - readinessProbe: - tcpSocket: - port: service - periodSeconds: {{ .Values.readinessProbe.periodSeconds }} - timeoutSeconds: {{ .Values.readinessProbe.timeoutSeconds }} - successThreshold: {{ .Values.readinessProbe.successThreshold }} - failureThreshold: {{ .Values.readinessProbe.failureThreshold }} resources: {{ toYaml .Values.resources | indent 12 }} {{- with .Values.nodeSelector }} diff --git a/stable/minio/values.yaml b/stable/minio/values.yaml index c56d437c75..b1a4054377 100644 --- a/stable/minio/values.yaml +++ b/stable/minio/values.yaml @@ -2,7 +2,7 @@ ## image: repository: minio/minio - tag: RELEASE.2018-09-01T00-38-25Z + tag: RELEASE.2018-09-12T18-49-56Z pullPolicy: IfNotPresent ## Set default image, imageTag, and imagePullPolicy for the `mc` (the minio @@ -10,7 +10,7 @@ image: ## mcImage: repository: minio/mc - tag: RELEASE.2018-08-18T02-13-04Z + tag: RELEASE.2018-09-10T23-39-12Z pullPolicy: IfNotPresent ## minio server mode, i.e. standalone or distributed.