From 2ba9f0765f5c273b12b618990cf142b4e5feb6e0 Mon Sep 17 00:00:00 2001 From: Shoichi Kaji Date: Mon, 20 May 2019 11:46:43 +0900 Subject: [PATCH 1/4] [stable/spinnaker] don't include mutable values in spec.volumeClaimTemplates.metadata.labels Signed-off-by: Shoichi Kaji --- stable/spinnaker/templates/statefulsets/halyard.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/stable/spinnaker/templates/statefulsets/halyard.yaml b/stable/spinnaker/templates/statefulsets/halyard.yaml index 5ddd15e267c1..8c21e24ac28f 100644 --- a/stable/spinnaker/templates/statefulsets/halyard.yaml +++ b/stable/spinnaker/templates/statefulsets/halyard.yaml @@ -143,7 +143,9 @@ spec: - metadata: name: halyard-home labels: -{{ include "spinnaker.standard-labels" . | indent 8 }} + app: {{ include "spinnaker.fullname" . | quote }} + heritage: {{ .Release.Service | quote }} + release: {{ .Release.Name | quote }} spec: accessModes: [ "ReadWriteOnce" ] resources: From b8692fb45dc966c6e953f3a5178cd178d3616d63 Mon Sep 17 00:00:00 2001 From: Shoichi Kaji Date: Mon, 20 May 2019 13:13:14 +0900 Subject: [PATCH 2/4] [stable/spinnaker] update to 1.10.0 Signed-off-by: Shoichi Kaji --- stable/spinnaker/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml index 845864c96146..b5ebb809ebfd 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.9.2 +version: 1.10.0 appVersion: 1.12.5 home: http://spinnaker.io/ sources: From 50efbac3785bc905150413c8433236702a692454 Mon Sep 17 00:00:00 2001 From: Shoichi Kaji Date: Mon, 20 May 2019 18:09:45 +0900 Subject: [PATCH 3/4] [stable/spinnaker] define spinnaker.standard-labels-base Signed-off-by: Shoichi Kaji --- stable/spinnaker/templates/_helpers.tpl | 5 ++++- stable/spinnaker/templates/statefulsets/halyard.yaml | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stable/spinnaker/templates/_helpers.tpl b/stable/spinnaker/templates/_helpers.tpl index 2be8d019a575..08cf9617ae2c 100644 --- a/stable/spinnaker/templates/_helpers.tpl +++ b/stable/spinnaker/templates/_helpers.tpl @@ -18,10 +18,13 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this {{/* Common labels for metadata. */}} -{{- define "spinnaker.standard-labels" -}} +{{- define "spinnaker.standard-labels-base" -}} app: {{ include "spinnaker.fullname" . | quote }} heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} +{{- end -}} +{{- define "spinnaker.standard-labels" -}} +{{ include "spinnaker.standard-labels-base" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}" {{- end -}} diff --git a/stable/spinnaker/templates/statefulsets/halyard.yaml b/stable/spinnaker/templates/statefulsets/halyard.yaml index 8c21e24ac28f..c66082c6751b 100644 --- a/stable/spinnaker/templates/statefulsets/halyard.yaml +++ b/stable/spinnaker/templates/statefulsets/halyard.yaml @@ -143,9 +143,7 @@ spec: - metadata: name: halyard-home labels: - app: {{ include "spinnaker.fullname" . | quote }} - heritage: {{ .Release.Service | quote }} - release: {{ .Release.Name | quote }} +{{ include "spinnaker.standard-labels-base" . | indent 8 }} spec: accessModes: [ "ReadWriteOnce" ] resources: From fd0235a7e6160f37599caed8812471a98a181689 Mon Sep 17 00:00:00 2001 From: Shoichi Kaji Date: Tue, 28 May 2019 23:15:03 +0900 Subject: [PATCH 4/4] [stable/spinnaker] update to 1.12.0 Signed-off-by: Shoichi Kaji --- stable/spinnaker/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stable/spinnaker/Chart.yaml b/stable/spinnaker/Chart.yaml index e3f764aa62e3..4f27a73fd165 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.11.0 +version: 1.12.0 appVersion: 1.12.5 home: http://spinnaker.io/ sources: