From 5f0b62f7b51770ca529aebbb3a113e8595a48cd8 Mon Sep 17 00:00:00 2001 From: Victor Sollerhed Date: Tue, 28 Aug 2018 19:12:53 +0200 Subject: [PATCH] [stable/gocd] Adding agent.hostAliases (similar to server.hostAliases) (#7331) * [stable/gocd] Add agent.hostAliases Signed-off-by: Victor Sollerhed * [stable/gocd] Bump chart version to 1.3.3 Signed-off-by: Victor Sollerhed * [stable/gocd] README for agent.privileged (#7055) Signed-off-by: Victor Sollerhed * [stable/gocd] Updated CHANGELOG. See https://github.com/helm/charts/pull/7331#discussion_r212662751 Signed-off-by: Victor Sollerhed --- stable/gocd/CHANGELOG.md | 6 +++++- stable/gocd/Chart.yaml | 2 +- stable/gocd/README.md | 2 ++ stable/gocd/templates/gocd-agent-deployment.yaml | 4 ++++ stable/gocd/values.yaml | 7 +++++++ 5 files changed, 19 insertions(+), 2 deletions(-) diff --git a/stable/gocd/CHANGELOG.md b/stable/gocd/CHANGELOG.md index 6da9a528fd..fa275f9a72 100644 --- a/stable/gocd/CHANGELOG.md +++ b/stable/gocd/CHANGELOG.md @@ -1,3 +1,7 @@ +### 1.3.3 + +* [0c5eadd](https://github.com/kubernetes/charts/commit/0c5eadd): Enable use of hostAliases for agents + ### 1.3.2 * [55d9cef](https://github.com/kubernetes/charts/commit/55d9cef): Add support for privileged mode, which is needed for DinD (Docker-in-Docker). @@ -5,7 +9,7 @@ ### 1.3.1 -* [7b9d6c0](https://github.com/kubernetes/charts/commit/7b9d6c0): Enable use of host aliases +* [7b9d6c0](https://github.com/kubernetes/charts/commit/7b9d6c0): Enable use of hostAliases for server * [273f042](https://github.com/kubernetes/charts/commit/273f042): Add documentation to hostAliases property * [d21a32d](https://github.com/kubernetes/charts/commit/d21a32d): Add hostAliases property to README diff --git a/stable/gocd/Chart.yaml b/stable/gocd/Chart.yaml index 2ebbfa22fb..312e8a7b4b 100644 --- a/stable/gocd/Chart.yaml +++ b/stable/gocd/Chart.yaml @@ -1,6 +1,6 @@ name: gocd home: https://www.gocd.org/ -version: 1.3.2 +version: 1.3.3 appVersion: 18.7.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 d606ce64b6..a868255984 100644 --- a/stable/gocd/README.md +++ b/stable/gocd/README.md @@ -165,10 +165,12 @@ $ 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.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` | | `agent.healthCheck.periodSeconds` | GoCD agent health check interval period. | `60` | | `agent.healthCheck.failureThreshold` | GoCD agent health check failure threshold. Number of unsuccessful attempts made to the GoCD server health check endpoint before restarting. | `60` | +| `agent.hostAliases` | Aliases for IPs in /etc/hosts | `[]` | | `agent.security.ssh.enabled` | Enable the use of SSH keys for GoCD agent | `false` | | `agent.security.ssh.secretName` | The name of the secret holding the SSH keys | `gocd-agent-ssh` | diff --git a/stable/gocd/templates/gocd-agent-deployment.yaml b/stable/gocd/templates/gocd-agent-deployment.yaml index 183a5e1d8f..b7da9174e6 100644 --- a/stable/gocd/templates/gocd-agent-deployment.yaml +++ b/stable/gocd/templates/gocd-agent-deployment.yaml @@ -117,3 +117,7 @@ spec: nodeSelector: {{ toYaml .Values.agent.nodeSelector | indent 8 }} {{- end }} + {{- if .Values.agent.hostAliases }} + hostAliases: +{{ toYaml .Values.agent.hostAliases | indent 8 }} + {{- end }} diff --git a/stable/gocd/values.yaml b/stable/gocd/values.yaml index b1d1238799..22b8086026 100644 --- a/stable/gocd/values.yaml +++ b/stable/gocd/values.yaml @@ -223,6 +223,13 @@ agent: # cpu: 100m # memory: 1024Mi + # agent.hostAliases allows the modification of the hosts file inside a container + hostAliases: + # - ip: "192.168.1.10" + # hostnames: + # - "example.com" + # - "www.example.com" + ## Additional GoCD agent pod labels ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/ nodeSelector: {}