From 00fb906f94f09eb8b8fa595d1899a59b4cc55381 Mon Sep 17 00:00:00 2001 From: Omega Zeng Date: Thu, 13 Jun 2019 16:32:15 +0800 Subject: [PATCH] - fixes #14581 (#14616) Signed-off-by: Omega Zeng --- stable/drone/Chart.yaml | 2 +- stable/drone/README.md | 1 + stable/drone/templates/deployment-server.yaml | 4 ++++ stable/drone/values.yaml | 10 ++++++++++ 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/stable/drone/Chart.yaml b/stable/drone/Chart.yaml index ec3fbac7e6..6490d304b2 100644 --- a/stable/drone/Chart.yaml +++ b/stable/drone/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 name: drone home: https://drone.io/ icon: https://drone.io/apple-touch-icon.png -version: 2.0.1 +version: 2.0.2 appVersion: 1.1.0 description: Drone is a Continuous Delivery system built on container technology keywords: diff --git a/stable/drone/README.md b/stable/drone/README.md index 88612c9cf2..87c148d12c 100644 --- a/stable/drone/README.md +++ b/stable/drone/README.md @@ -93,6 +93,7 @@ The following table lists the configurable parameters of the drone charts and th | `server.schedulerName` | Drone **server** alternate scheduler name | `nil` | | `server.affinity` | Drone **server** scheduling preferences | `{}` | | `server.nodeSelector` | Drone **server** node labels for pod assignment | `{}` | +| `server.tolerations` | Drone **server** node taints to tolerate | `[]` | | `server.extraContainers` | Additional sidecar containers | `""` | | `server.extraVolumes` | Additional volumes for use in extraContainers | `""` | | `agent.env` | Drone **agent** environment variables | `(default values)` | diff --git a/stable/drone/templates/deployment-server.yaml b/stable/drone/templates/deployment-server.yaml index b88dee79c1..d53fdc20e9 100644 --- a/stable/drone/templates/deployment-server.yaml +++ b/stable/drone/templates/deployment-server.yaml @@ -37,6 +37,10 @@ spec: {{- if .Values.server.nodeSelector }} nodeSelector: {{ toYaml .Values.server.nodeSelector | indent 8 }} +{{- end }} +{{- with .Values.server.tolerations }} + tolerations: + {{- toYaml . | nindent 6 }} {{- end }} serviceAccountName: {{ template "drone.serviceAccountName" . }} containers: diff --git a/stable/drone/values.yaml b/stable/drone/values.yaml index f51444a8c6..a93ca82c8e 100644 --- a/stable/drone/values.yaml +++ b/stable/drone/values.yaml @@ -192,6 +192,11 @@ server: ## nodeSelector: {} + ## Node taints to tolerate + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + ## + tolerations: [] + ## additional siecar containers, e. g. for a database proxy, such as Google's cloudsql-proxy. ## ex: https://github.com/kubernetes/charts/tree/master/stable/keycloak ## @@ -248,6 +253,11 @@ agent: ## nodeSelector: {} + ## Node taints to tolerate + ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/ + ## + tolerations: [] + dind: ## Enable or disable DinD ## If disabled, the drone agent will spawn docker containers on the host. Pay