Skip to content

Commit

Permalink
[stable/spinnaker] fix bug where spinnaker can't connect to minio (he…
Browse files Browse the repository at this point in the history
…lm#14866)

* [stable/spinnaker] fix bug where spinnaker can't connect to minio

As reported in spinnaker itself [here](spinnaker/spinnaker#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 <username.taken@gmail.com>

* bump halyard version for cli arg needed

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>

* fix argument

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>

* fix version

Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
Signed-off-by: Andrii Nasinnyk <anasinnyk@macpaw.com>
  • Loading branch information
paulczar authored and anasinnyk committed Jun 29, 2019
1 parent 90a7b17 commit 40b1664
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion stable/spinnaker/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
6 changes: 5 additions & 1 deletion stable/spinnaker/templates/configmap/halyard-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion stable/spinnaker/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit 40b1664

Please sign in to comment.