Merge pull request #17 from paulczar/update-minio-redis-deps

update helm dependencies
viglesiasce · Jul 19, 2018 · 1f30a21 · 1f30a21
2 parents c2776d5 + 3a03a5a
commit 1f30a21
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/stable/spinnaker/requirements.lock b/stable/spinnaker/requirements.lock
@@ -1,9 +1,9 @@
 dependencies:
 - name: redis
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.1.6
+  version: 3.6.4
 - name: minio
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 1.1.1
-digest: sha256:8da1ca1cff738d5421f6b37f98aa9e1b7598db14125b0ac0d326d6f592e0120e
-generated: 2018-06-29T14:43:16.899559301-07:00
+  version: 1.5.0
+digest: sha256:e97bb4b0f7878f6fc3a375b6fca43bcfd778b6629db7dd46cd508b932548de02
+generated: 2018-07-18T13:48:10.143246511-05:00
diff --git a/stable/spinnaker/requirements.yaml b/stable/spinnaker/requirements.yaml
@@ -1,8 +1,8 @@
 dependencies:
 - name: redis
-  version: 1.1.6
+  version: 3.6.4
   repository: https://kubernetes-charts.storage.googleapis.com/
 - name: minio
-  version: 1.1.1
+  version: 1.5.0
   repository: https://kubernetes-charts.storage.googleapis.com/
   condition: minio.enabled
diff --git a/stable/spinnaker/templates/statefulsets/halyard.yaml b/stable/spinnaker/templates/statefulsets/halyard.yaml
@@ -33,7 +33,7 @@ spec:
           printf 'server.address: 0.0.0.0\n' > /tmp/config/halyard-local.yml && \
           # Use Redis deployed via the dependent Helm chart
           mkdir -p /tmp/spinnaker/.hal/default/service-settings && \
-          printf 'overrideBaseUrl: redis://:{{ .Values.redis.redisPassword }}@{{ .Release.Name }}-redis:6379\nskipLifeCycleManagement: true\n' > /tmp/spinnaker/.hal/default/service-settings/redis.yml && \
+          printf 'overrideBaseUrl: redis://:{{ .Values.redis.password }}@{{ .Release.Name }}-redis-master:6379\nskipLifeCycleManagement: true\n' > /tmp/spinnaker/.hal/default/service-settings/redis.yml && \
           # Route the /gate path of Deck to Gate
           printf 'env:\n  API_HOST: http://spin-gate.{{ .Release.Namespace }}:8084/\n' > /tmp/spinnaker/.hal/default/service-settings/deck.yml
         volumeMounts:

diff --git a/stable/spinnaker/values.yaml b/stable/spinnaker/values.yaml
@@ -74,14 +74,16 @@ nodeSelector: {}
 # Redis password to use for the in-cluster redis service
 # Redis is not exposed publically
 redis:
-  redisPassword: password
+  password: password
   nodeSelector: {}
+  cluster:
+    enabled: false
 
 # Minio access/secret keys for the in-cluster S3 usage
 # Minio is not exposed publically
 minio:
   enabled: true
-  imageTag: RELEASE.2016-11-26T02-23-47Z
+  imageTag: RELEASE.2018-06-09T02-18-09Z
   serviceType: ClusterIP
   accessKey: spinnakeradmin
   secretKey: spinnakeradmin