From 5056ebd3a94dab43cec92547cd85afa21a6e65e9 Mon Sep 17 00:00:00 2001
From: Ian Burrell <ianburrell@gmail.com>
Date: Mon, 18 Dec 2017 07:06:34 -0800
Subject: [PATCH]  Use Values.uuid for cluster id with default of uuidv4
 (#3055)

* Use Values.uuid for cluster id with default of uuidv4

Currently uses uuidv4 for cluster-id and the "default" Values.uuid won't be
used.

* Bump spartakus version to 1.1.2
---
 stable/spartakus/Chart.yaml                | 2 +-
 stable/spartakus/templates/deployment.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/stable/spartakus/Chart.yaml b/stable/spartakus/Chart.yaml
index 12e7e9d51c..5299ac57d9 100755
--- a/stable/spartakus/Chart.yaml
+++ b/stable/spartakus/Chart.yaml
@@ -1,5 +1,5 @@
 name: spartakus
-version: 1.1.1
+version: 1.1.2
 description: Collect information about Kubernetes clusters to help improve the project.
 sources:
   - https://github.com/kubernetes-incubator/spartakus
diff --git a/stable/spartakus/templates/deployment.yaml b/stable/spartakus/templates/deployment.yaml
index 1eb744c3c1..eaa6c12ff5 100644
--- a/stable/spartakus/templates/deployment.yaml
+++ b/stable/spartakus/templates/deployment.yaml
@@ -25,7 +25,7 @@ spec:
           imagePullPolicy: "{{ .Values.image.pullPolicy }}"
           args:
             - volunteer
-            - --cluster-id="{{ uuidv4 | default .Values.uuid }}"
+            - --cluster-id="{{ .Values.uuid | default uuidv4 }}"
           {{- range $key, $value := .Values.extraArgs }}
             - --{{ $key }}={{ $value }}
           {{- end }}