From 098077e9719a03cd70ef0b2ed60433fc703640fa Mon Sep 17 00:00:00 2001
From: Komazaki <komattaka@users.noreply.github.com>
Date: Wed, 9 May 2018 02:39:52 +0900
Subject: [PATCH] [stable/spinnaker] Fix for k8s 1.9.4 or upper version (#5238)

* update minio chart version

* change minio endpoint

* change minio client image for using mc mb -p option

* update chart version to 0.4.1
---
 stable/spinnaker/Chart.yaml                                | 2 +-
 stable/spinnaker/requirements.lock                         | 6 +++---
 stable/spinnaker/requirements.yaml                         | 2 +-
 stable/spinnaker/templates/configmap/spinnaker-config.yaml | 2 +-
 stable/spinnaker/templates/hooks/create-bucket.yaml        | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml
index ff53d8ba42..da1d5ad8ee 100644
--- a/stable/spinnaker/Chart.yaml
+++ b/stable/spinnaker/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence.
 name: spinnaker
-version: 0.4.0
+version: 0.4.1
 appVersion: 1.6.0
 home: http://spinnaker.io/
 sources:
diff --git a/stable/spinnaker/requirements.lock b/stable/spinnaker/requirements.lock
index b24590784b..944afd4e13 100644
--- a/stable/spinnaker/requirements.lock
+++ b/stable/spinnaker/requirements.lock
@@ -4,9 +4,9 @@ dependencies:
   version: 1.1.6
 - name: minio
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 0.4.3
+  version: 1.1.1
 - name: jenkins
   repository: https://kubernetes-charts.storage.googleapis.com/
   version: 0.13.3
-digest: sha256:5cdbf5aa7fa2f1fab477b75cbe931bb053e261c4437413af3c8d8a39b119924c
-generated: 2018-02-25T13:11:01.017154568-08:00
+digest: sha256:c41d8c94dd87eccc61df25f2cdea2fd35e370a89d2c6742028585c7998339c41
+generated: 2018-04-25T10:53:14.553461816+09:00
diff --git a/stable/spinnaker/requirements.yaml b/stable/spinnaker/requirements.yaml
index 6d0346f91c..a48134d90c 100644
--- a/stable/spinnaker/requirements.yaml
+++ b/stable/spinnaker/requirements.yaml
@@ -3,7 +3,7 @@ dependencies:
   version: 1.1.6
   repository: https://kubernetes-charts.storage.googleapis.com/
 - name: minio
-  version: 0.4.3
+  version: 1.1.1
   repository: https://kubernetes-charts.storage.googleapis.com/
   condition: minio.enabled
 - name: jenkins
diff --git a/stable/spinnaker/templates/configmap/spinnaker-config.yaml b/stable/spinnaker/templates/configmap/spinnaker-config.yaml
index 204148131d..fc1cbc74b7 100644
--- a/stable/spinnaker/templates/configmap/spinnaker-config.yaml
+++ b/stable/spinnaker/templates/configmap/spinnaker-config.yaml
@@ -355,7 +355,7 @@ data:
           enabled: false
         s3:
           enabled: true
-          endpoint: http://{{ .Release.Name }}-minio-svc:9000
+          endpoint: http://{{ .Release.Name }}-minio:9000
         {{ end }}
       gate:
         host: {{ template "fullname" . }}-gate
diff --git a/stable/spinnaker/templates/hooks/create-bucket.yaml b/stable/spinnaker/templates/hooks/create-bucket.yaml
index b943479b47..9e4114415c 100644
--- a/stable/spinnaker/templates/hooks/create-bucket.yaml
+++ b/stable/spinnaker/templates/hooks/create-bucket.yaml
@@ -22,9 +22,9 @@ spec:
       restartPolicy: OnFailure
       containers:
       - name: post-install-job
-        image: "viglesiasce/minio-client:v0.4.0"
+        image: "minio/mc:RELEASE.2018-03-25T01-22-22Z"
         command:
         - sh
         - -c
-        - "mc config host add {{.Release.Name}}-minio http://{{.Release.Name}}-minio-svc:9000 {{ .Values.minio.accessKey }} {{ .Values.minio.secretKey }} S3v4 &&  mc mb {{.Release.Name}}-minio/spinnaker"
+        - "mc config host add {{.Release.Name}}-minio http://{{.Release.Name}}-minio:9000 {{ .Values.minio.accessKey }} {{ .Values.minio.secretKey }} S3v4 && mc mb -p {{.Release.Name}}-minio/spinnaker"
 {{- end }}