From 0b64339862d26dd55a6640a9172338deee6f93a2 Mon Sep 17 00:00:00 2001 From: Chad Wilson Date: Tue, 29 Oct 2024 12:30:08 +0800 Subject: [PATCH] Ensure static agents are listening on accessible ports when health check enabled --- gocd/CHANGELOG.md | 2 ++ gocd/Chart.yaml | 2 +- gocd/templates/gocd-agent-deployment.yaml | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/gocd/CHANGELOG.md b/gocd/CHANGELOG.md index 12c34c7..85a5ed9 100644 --- a/gocd/CHANGELOG.md +++ b/gocd/CHANGELOG.md @@ -1,3 +1,5 @@ +### 2.9.3 +* Ensure agent is listening on correct interface when health check enabled (thanks to @chadlwilson and @12345ieee) ### 2.9.2 * Bump pre-installed plugins to latest patched versions (thanks to @chadlwilson) ### 2.9.1 diff --git a/gocd/Chart.yaml b/gocd/Chart.yaml index 9c97c02..e23b5d8 100644 --- a/gocd/Chart.yaml +++ b/gocd/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: gocd home: https://www.gocd.org/ -version: 2.9.2 +version: 2.9.3 appVersion: 24.3.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/gocd/templates/gocd-agent-deployment.yaml b/gocd/templates/gocd-agent-deployment.yaml index f3dfc86..e13dcc6 100644 --- a/gocd/templates/gocd-agent-deployment.yaml +++ b/gocd/templates/gocd-agent-deployment.yaml @@ -105,9 +105,9 @@ spec: - name: AGENT_AUTO_REGISTER_HOSTNAME value: {{ .Values.agent.env.agentAutoRegisterHostname }} {{- end }} - {{- if .Values.agent.env.goAgentJvmOpts }} + {{- if or .Values.agent.healthCheck.enabled .Values.agent.env.goAgentJvmOpts }} - name: GOCD_AGENT_JVM_OPTS - value: {{ .Values.agent.env.goAgentJvmOpts }} + value: {{ if .Values.agent.healthCheck.enabled }}-Dgo.agent.status.api.bind.host=0.0.0.0{{ end }} {{ .Values.agent.env.goAgentJvmOpts }} {{- end }} {{- if .Values.agent.env.goAgentBootstrapperJvmArgs }} - name: AGENT_BOOTSTRAPPER_JVM_ARGS