From 21b3dcbb8ee7628fc469e4e9b2c984d01d229ad3 Mon Sep 17 00:00:00 2001 From: Paul Czarkowski Date: Mon, 24 Jun 2019 23:20:35 -0500 Subject: [PATCH] [stable/spinnaker] fix bug where spinnaker can't connect to minio (#14866) * [stable/spinnaker] fix bug where spinnaker can't connect to minio As reported in spinnaker itself [here](https://github.com/spinnaker/spinnaker/issues/4431), It doesn't appear to affect the current stable build, but it has problems with the nightly builds. This change should innoculate us from that bug if it makes it through to a stable build. Effectively the issue is that in the newer builds of spinnaker it attempts to use domain paths for s3 access. This means instead of trying to connect to `spinnaker-minio/spinnaker` which should be valid dns for the minio service it tries to connect to `spinnaker.spinnaker-minio` and fails because this is not valid dns for minio. Signed-off-by: Paul Czarkowski * bump halyard version for cli arg needed Signed-off-by: Paul Czarkowski * fix argument Signed-off-by: Paul Czarkowski * fix version Signed-off-by: Paul Czarkowski --- stable/spinnaker/Chart.yaml | 2 +- stable/spinnaker/templates/configmap/halyard-config.yaml | 6 +++++- stable/spinnaker/values.yaml | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml index 4f27a73fd1..032463e327 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: 1.12.0 +version: 1.13.0 appVersion: 1.12.5 home: http://spinnaker.io/ sources: diff --git a/stable/spinnaker/templates/configmap/halyard-config.yaml b/stable/spinnaker/templates/configmap/halyard-config.yaml index 1b7fc11ce1..9f890ea178 100644 --- a/stable/spinnaker/templates/configmap/halyard-config.yaml +++ b/stable/spinnaker/templates/configmap/halyard-config.yaml @@ -35,7 +35,11 @@ data: # Storage {{ if .Values.minio.enabled }} - echo {{ .Values.minio.secretKey }} | $HAL_COMMAND config storage s3 edit --endpoint http://{{ .Release.Name }}-minio:9000 --access-key-id {{ .Values.minio.accessKey }} --secret-access-key --bucket {{ .Values.minio.bucket }} + echo {{ .Values.minio.secretKey }} | $HAL_COMMAND config storage s3 edit \ + --endpoint http://{{ .Release.Name }}-minio:9000 \ + --access-key-id {{ .Values.minio.accessKey }} \ + --secret-access-key --bucket {{ .Values.minio.bucket }} \ + --path-style-access true $HAL_COMMAND config storage edit --type s3 {{ end }} {{ if .Values.s3.enabled }} diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml index dd95792afb..da33fcf4f3 100644 --- a/stable/spinnaker/values.yaml +++ b/stable/spinnaker/values.yaml @@ -2,7 +2,7 @@ halyard: spinnakerVersion: 1.12.5 image: repository: gcr.io/spinnaker-marketplace/halyard - tag: 1.16.0 + tag: 1.20.2 # Provide a config map with Hal commands that will be run the core config (storage) # The config map should contain a script in the config.sh key additionalScripts: