mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/drone] Add nodeSelector config parameter (#6328)
* [stable/drone] Add nodeSelector config parameter * [stable/drone] Fixed conflict * [stable/drone] updated version
This commit is contained in:
@@ -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:
|
||||
|
||||
@@ -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 | `{}` |
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user