From 103e93d3f2b91f84abec28f1f3eab14f1fb93ae0 Mon Sep 17 00:00:00 2001 From: Paul Czarkowski Date: Tue, 10 Dec 2019 15:20:06 -0600 Subject: [PATCH] [stable/spinnaker] allow for extra s3 args (#19514) This helps when a deployer is using a self hosted s3 alternative and needs to add extra options such as `--path-style-access true`. Signed-off-by: Paul Czarkowski --- stable/spinnaker/Chart.yaml | 2 +- stable/spinnaker/templates/configmap/halyard-config.yaml | 3 +++ stable/spinnaker/values.yaml | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml index 00d9db60dd..a117d7d190 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.22.1 +version: 1.22.3 appVersion: 1.16.2 home: http://spinnaker.io/ sources: diff --git a/stable/spinnaker/templates/configmap/halyard-config.yaml b/stable/spinnaker/templates/configmap/halyard-config.yaml index e27dd6da83..5deb71906e 100644 --- a/stable/spinnaker/templates/configmap/halyard-config.yaml +++ b/stable/spinnaker/templates/configmap/halyard-config.yaml @@ -67,6 +67,9 @@ data: {{- if .Values.s3.secretKey }} --secret-access-key \ {{- end }} + {{- range .Values.s3.extraArgs }} + {{- . }} \ + {{- end }} $HAL_COMMAND config storage edit --type s3 {{ end }} diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml index df7d8bcba8..a475d3713c 100644 --- a/stable/spinnaker/values.yaml +++ b/stable/spinnaker/values.yaml @@ -283,6 +283,9 @@ s3: # accessKey: "" # secretKey: "" # assumeRole: "" + ## Here you can pass extra arguments to configure s3 storage options + extraArgs: [] + # - "--path-style-access true" # Azure Storage Account azs: