From c5970e149f580e2e968b0462012967546985e8b5 Mon Sep 17 00:00:00 2001 From: Sheroy Marker Date: Thu, 10 Jan 2019 23:46:26 -0800 Subject: [PATCH] Fixes regression of functionality that allows for extra volumes and mounts regardless of whether persistence and ssh is enabled (#10541) * Fixes the regression of the functionality that allows volumes and volume mounts regardless of whether persistence or ssh are enabled. Signed-off-by: Sheroy Marker * Updates the changelog. Signed-off-by: Sheroy Marker --- stable/gocd/CHANGELOG.md | 5 +++++ stable/gocd/Chart.yaml | 2 +- stable/gocd/templates/gocd-agent-deployment.yaml | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stable/gocd/CHANGELOG.md b/stable/gocd/CHANGELOG.md index 41a84e5213..1ec42d619f 100644 --- a/stable/gocd/CHANGELOG.md +++ b/stable/gocd/CHANGELOG.md @@ -1,3 +1,8 @@ +### 1.6.3 + +* [bca4092f](https://github.com/kubernetes/charts/commit/bca4092f): + - Fixes regression of functionality that allows for extra volumes and mounts regardless of whether persistence and ssh is enabled + ### 1.6.2 * [fe985d7](https://github.com/kubernetes/charts/commit/fe985d7): diff --git a/stable/gocd/Chart.yaml b/stable/gocd/Chart.yaml index 128d4166b1..f291379d1d 100644 --- a/stable/gocd/Chart.yaml +++ b/stable/gocd/Chart.yaml @@ -1,6 +1,6 @@ name: gocd home: https://www.gocd.org/ -version: 1.6.2 +version: 1.6.3 appVersion: 18.12.0 description: GoCD is an open-source continuous delivery server to model and visualize complex workflows with ease. icon: https://gocd.github.io/assets/images/go-icon-black-192x192.png diff --git a/stable/gocd/templates/gocd-agent-deployment.yaml b/stable/gocd/templates/gocd-agent-deployment.yaml index 59b4c93422..84b533c436 100644 --- a/stable/gocd/templates/gocd-agent-deployment.yaml +++ b/stable/gocd/templates/gocd-agent-deployment.yaml @@ -27,7 +27,7 @@ spec: component: agent spec: serviceAccountName: {{ template "gocd.agentServiceAccountName" . }} - {{- if or .Values.agent.persistence.enabled .Values.agent.security.ssh.enabled }} + {{- if or .Values.agent.persistence.enabled (or .Values.agent.security.ssh.enabled .Values.agent.persistence.extraVolumes) }} volumes: {{- end }} {{- if .Values.agent.persistence.enabled }}