diff --git a/stable/gocd/CHANGELOG.md b/stable/gocd/CHANGELOG.md index 2ee0095ba4..349c1cc816 100644 --- a/stable/gocd/CHANGELOG.md +++ b/stable/gocd/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.4.2 + +* [499fddf9](https://github.com/kubernetes/charts/commit/499fddf9): Add agent.env.extraEnvVars + ### 1.4.1 * [15c77caf](https://github.com/kubernetes/charts/commit/15c77caf): - Bump up GoCD app version to 18.9.0 diff --git a/stable/gocd/Chart.yaml b/stable/gocd/Chart.yaml index 0267407f46..919a767502 100644 --- a/stable/gocd/Chart.yaml +++ b/stable/gocd/Chart.yaml @@ -1,6 +1,6 @@ name: gocd home: https://www.gocd.org/ -version: 1.4.1 +version: 1.4.2 appVersion: 18.9.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/README.md b/stable/gocd/README.md index 318c4e7ca5..9a9881e962 100644 --- a/stable/gocd/README.md +++ b/stable/gocd/README.md @@ -165,6 +165,7 @@ $ kubectl create secret generic gocd-server-ssh \ | `agent.env.agentAutoRegisterHostname` | GoCD Agent hostname | `nil` | | `agent.env.goAgentBootstrapperArgs` | GoCD Agent Bootstrapper Args. It can be used to [Configure end-to-end transport security](https://docs.gocd.org/current/installation/ssl_tls/end_to_end_transport_security.html) | `nil` | | `agent.env.goAgentBootstrapperJvmArgs` | GoCD Agent Bootstrapper JVM Args. | `nil` | +| `agent.env.extraEnvVars` | GoCD Agent extra Environment variables | `nil` | | `agent.privileged` | Run container in privileged mode (needed for DinD, Docker-in-Docker agents) | `false` | | `agent.healthCheck.enabled` | Enable use of GoCD agent health checks. | `false` | | `agent.healthCheck.initialDelaySeconds` | GoCD agent start up time. | `60` | diff --git a/stable/gocd/templates/gocd-agent-deployment.yaml b/stable/gocd/templates/gocd-agent-deployment.yaml index b7da9174e6..d75a817d53 100644 --- a/stable/gocd/templates/gocd-agent-deployment.yaml +++ b/stable/gocd/templates/gocd-agent-deployment.yaml @@ -81,6 +81,9 @@ spec: - name: AGENT_BOOTSTRAPPER_ARGS value: {{ .Values.agent.env.goAgentBootstrapperArgs }} {{- end }} + {{- if .Values.agent.env.extraEnvVars }} +{{ toYaml .Values.agent.env.extraEnvVars | indent 12 }} + {{- end }} {{- if .Values.agent.healthCheck.enabled }} livenessProbe: httpGet: diff --git a/stable/gocd/values.yaml b/stable/gocd/values.yaml index 6111c4a7ce..0ba68126df 100644 --- a/stable/gocd/values.yaml +++ b/stable/gocd/values.yaml @@ -170,6 +170,8 @@ agent: goAgentBootstrapperArgs: # agent.env.goAgentBootstrapperJvmArgs is the GoCD Agent bootstrapper JVM args goAgentBootstrapperJvmArgs: + # agent.env.extraEnvVars is the list of environment variables passed to GoCD Agent + extraEnvVars: persistence: # agent.persistence.enabled is the toggle for agent volume persistence. Change to true if a persistent volume is available and configured manually. enabled: false