Gocd/fix affinity (#8521)

* gocd: Invalid nodeSelector reference

Missing "agent" in if case

Signed-off-by: Johnny Bergström <johnny@klaudify.se>

* gocd: Add affinity setting

Agent and server affinity values for more flexibility.
Node selector will be deprecated in future k8s

Signed-off-by: Johnny Bergström <johnny@klaudify.se>

* gocd: Bump version and changelog

Signed-off-by: Johnny Bergström <johnny@klaudify.se>

* gocd: empty line messing up README

Signed-off-by: Johnny Bergström <johnny@klaudify.se>
This commit is contained in:
Johnny Bergström
2018-10-22 15:27:15 -07:00
committed by k8s-ci-robot
parent 6f35327d75
commit bd63ae2af8
6 changed files with 26 additions and 2 deletions
+6
View File
@@ -1,3 +1,9 @@
### 1.5.3
* [65fa6218](https://github.com/kubernetes/charts/commit/65fa6218):
- Affinity setting in agent and server deployments
* [587d7a37](https://github.com/kubernetes/charts/commit/587d7a37):
- Invalid nodeSelector reference for agent deployment
### 1.5.2
* [17fa5c8e](https://github.com/kubernetes/charts/commit/17fa5c8e): Fix agent kube resources typo.
+1 -1
View File
@@ -1,6 +1,6 @@
name: gocd
home: https://www.gocd.org/
version: 1.5.2
version: 1.5.3
appVersion: 18.10.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
+2
View File
@@ -74,6 +74,7 @@ The following tables list the configurable parameters of the GoCD chart and thei
| `server.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `server.resources` | GoCD server resource requests and limits | `{}` |
| `server.nodeSelector` | GoCD server nodeSelector for pod labels | `{}` |
| `server.affinity` | GoCD server affinity | `{}` |
| `server.env.goServerSystemProperties` | GoCD Server system properties | `nil` |
| `server.env.extraEnvVars` | GoCD Server extra Environment variables | `nil` |
| `server.service.type` | Type of GoCD server Kubernetes service | `NodePort` |
@@ -158,6 +159,7 @@ $ kubectl create secret generic gocd-server-ssh \
| `agent.image.pullPolicy` | Image pull policy | `IfNotPresent` |
| `agent.resources` | GoCD agent resource requests and limits | `{}` |
| `agent.nodeSelector` | GoCD agent nodeSelector for pod labels | `{}` |
| `agent.affinity` | GoCD agent affinity | `{}` |
| `agent.env.goServerUrl` | GoCD Server Url. If nil, discovers the GoCD server service if its available on the Kubernetes cluster | `nil` |
| `agent.env.agentAutoRegisterKey` | GoCD Agent autoregister key | `nil` |
| `agent.env.agentAutoRegisterResources` | Comma separated list of GoCD Agent resources | `nil` |
@@ -122,9 +122,13 @@ spec:
{{- end }}
securityContext:
privileged: {{ .Values.agent.privileged }}
{{- if .Values.nodeSelector }}
{{- if .Values.agent.nodeSelector }}
nodeSelector:
{{ toYaml .Values.agent.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.agent.affinity }}
affinity:
{{ toYaml .Values.agent.affinity | indent 8 }}
{{- end }}
{{- if .Values.agent.hostAliases }}
hostAliases:
@@ -114,6 +114,10 @@ spec:
{{- if .Values.server.nodeSelector }}
nodeSelector:
{{ toYaml .Values.server.nodeSelector | indent 8 }}
{{- end }}
{{- if .Values.server.affinity }}
affinity:
{{ toYaml .Values.server.affinity | indent 8 }}
{{- end }}
{{- if .Values.server.hostAliases }}
hostAliases:
+8
View File
@@ -48,6 +48,10 @@ server:
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
nodeSelector: {}
## Affinity for assigning pods to specific nodes
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
affinity: {}
healthCheck:
# server.healthCheck.initialDelaySeconds is the initial delays in seconds to start the health checks
initialDelaySeconds: 90
@@ -279,3 +283,7 @@ agent:
## Additional GoCD agent pod labels
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
nodeSelector: {}
## Affinity for assigning pods to specific nodes
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
affinity: {}