From b206c7e68c4fc92f47a0bfcb6f8db8ca8ba8cb1d Mon Sep 17 00:00:00 2001 From: zxcvbnius Date: Mon, 2 Jul 2018 06:31:18 +0800 Subject: [PATCH] [stable/drone] Add nodeSelector config parameter (#6328) * [stable/drone] Add nodeSelector config parameter * [stable/drone] Fixed conflict * [stable/drone] updated version --- stable/drone/Chart.yaml | 2 +- stable/drone/README.md | 6 ++++-- stable/drone/templates/deployment-agent.yaml | 4 ++++ stable/drone/templates/deployment-server.yaml | 4 ++++ stable/drone/values.yaml | 12 ++++++++++++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/stable/drone/Chart.yaml b/stable/drone/Chart.yaml index 750aec7108..67c6de23e4 100644 --- a/stable/drone/Chart.yaml +++ b/stable/drone/Chart.yaml @@ -1,7 +1,7 @@ name: drone home: https://drone.io/ icon: https://drone.io/apple-touch-icon.png -version: 1.3.0 +version: 1.4.0 appVersion: 0.8.5 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 6f0b577664..a75e3bf251 100644 --- a/stable/drone/README.md +++ b/stable/drone/README.md @@ -56,14 +56,16 @@ The following table lists the configurable parameters of the drone charts and th | `server.resources` | Drone **server** pod resource requests & limits | `{}` | | `server.schedulerName` | Drone **server** alternate scheduler name | `nil` | | `server.affinity` | Drone **server** scheduling preferences | `{}` | -| `server.extraContainers` | Additional sidecar containers | `""` | -| `server.extraVolumes` | Additional volumes for use in extraContainers | `""` | +| `server.nodeSelector` | Drone **server** node labels for pod assignment | `{}` | +| `server.extraContainers` | Additional sidecar containers | `""` | +| `server.extraVolumes` | Additional volumes for use in extraContainers | `""` | | `agent.env` | Drone **agent** environment variables | `(default values)` | | `agent.replicas` | Drone **agent** replicas | `1` | | `agent.annotations` | Drone **agent** annotations | `{}` | | `agent.resources` | Drone **agent** pod resource requests & limits | `{}` | | `agent.schedulerName` | Drone **agent** alternate scheduler name | `nil` | | `agent.affinity` | Drone **agent** scheduling preferences | `{}` | +| `agent.nodeSelector` | Drone **agent** node labels for pod assignment | `{}` | | `dind.enabled` | Enable or disable **DinD** | `true` | | `dind.driver` | **DinD** storage driver | `overlay2` | | `dind.resources` | **DinD** pod resource requests & limits | `{}` | diff --git a/stable/drone/templates/deployment-agent.yaml b/stable/drone/templates/deployment-agent.yaml index 570249eb18..9c61175e4d 100644 --- a/stable/drone/templates/deployment-agent.yaml +++ b/stable/drone/templates/deployment-agent.yaml @@ -28,6 +28,10 @@ spec: {{- if .Values.agent.affinity }} affinity: {{ toYaml .Values.agent.affinity | indent 8 }} +{{- end }} +{{- if .Values.agent.nodeSelector }} + nodeSelector: +{{ toYaml .Values.agent.nodeSelector | indent 8 }} {{- end }} serviceAccountName: {{ template "drone.serviceAccountName" . }} containers: diff --git a/stable/drone/templates/deployment-server.yaml b/stable/drone/templates/deployment-server.yaml index f475ece4ff..ba9bb756a4 100644 --- a/stable/drone/templates/deployment-server.yaml +++ b/stable/drone/templates/deployment-server.yaml @@ -29,6 +29,10 @@ spec: {{- if .Values.server.affinity }} affinity: {{ toYaml .Values.server.affinity | indent 8 }} +{{- end }} +{{- if .Values.server.nodeSelector }} + nodeSelector: +{{ toYaml .Values.server.nodeSelector | indent 8 }} {{- end }} serviceAccountName: {{ template "drone.serviceAccountName" . }} containers: diff --git a/stable/drone/values.yaml b/stable/drone/values.yaml index eef2f00b57..90b880dc47 100644 --- a/stable/drone/values.yaml +++ b/stable/drone/values.yaml @@ -122,11 +122,18 @@ server: ## affinity: {} + ## Node labels for pod assignment + ## ref: https://kubernetes.io/docs/user-guide/node-selection + ## + nodeSelector: {} + ## 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 + ## extraContainers: | ## additional volumes, e. g. for secrets used in an extraContainers. + ## extraVolumes: | agent: @@ -165,6 +172,11 @@ agent: ## affinity: {} + ## Node labels for pod assignment + ## ref: https://kubernetes.io/docs/user-guide/node-selection + ## + nodeSelector: {} + dind: ## Enable or disable DinD ## If disabled, the drone agent will spawn docker containers on the host. Pay