github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Makes agent + server affinities configurable (#3455)

Browse Source
This commit is contained in:
Federico Nusymowicz
2018-01-30 09:33:07 -08:00
committed by k8s-ci-robot
parent 5a47997e12
commit 3eb083669c
5 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
incubator/drone/Chart.yaml
+2 -2
View File
@@ -1,8 +1,8 @@
name: drone
home: https://drone.io/
icon: http://docs.drone.io/logo.svg
version: 0.3.0
appVersion: 0.8.2
version: 0.3.1
appVersion: 0.8.4
description: Drone is a Continuous Delivery system built on container technology
keywords:
- continuous-delivery
incubator/drone/README.md
+4 -2
View File
@@ -34,10 +34,10 @@ The following tables lists the configurable parameters of the drone charts and t
| Parameter | Description | Default |
|-----------------------------|-----------------------------------------------------------------------------------------------|-----------------------------|
| `images.server.repository` | Drone **server** image | `docker.io/drone/drone` |
| `images.server.tag` | Drone **server** image tag | `0.8.2` |
| `images.server.tag` | Drone **server** image tag | `0.8.4` |
| `images.server.pullPolicy` | Drone **server** image pull policy | `IfNotPresent` |
| `images.agent.repository` | Drone **agent** image | `docker.io/drone/agent` |
| `images.agent.tag` | Drone **agent** image tag | `0.8.2` |
| `images.agent.tag` | Drone **agent** image tag | `0.8.4` |
| `images.agent.pullPolicy` | Drone **agent** image pull policy | `IfNotPresent` |
| `images.dind.repository` | Docker **dind** image | `docker.io/library/docker` |
| `images.dind.tag` | Docker **dind** image tag | `17.12.0-ce-dind` |
@@ -53,9 +53,11 @@ The following tables lists the configurable parameters of the drone charts and t
| `server.host` | Drone **server** hostname | `(internal hostname)` |
| `server.env` | Drone **server** environment variables | `(default values)` |
| `server.resources` | Drone **server** pod resource requests & limits | `{}` |
| `server.afinity` | Drone **server** scheduling preferences | `{}` |
| `agent.env` | Drone **agent** environment variables | `(default values)` |
| `agent.replicas` | Drone **agent** replicas | `1` |
| `agent.resources` | Drone **agent** pod resource requests & limits | `{}` |
| `agent.afinity` | Drone **agent** scheduling preferences | `{}` |
| `dind.driver` | **DinD** storage driver | `overlay2` |
| `dind.resources` | **DinD** pod resource requests & limits | `{}` |
| `persistence.enabled` | Use a PVC to persist data | `true` |
incubator/drone/templates/deployment-agent.yaml
+4
View File
@@ -19,6 +19,10 @@ spec:
release: "{{ .Release.Name }}"
component: agent
spec:
{{- if .Values.agent.affinity }}
affinity:
{{ toYaml .Values.agent.affinity | indent 8 }}
{{- end }}
containers:
- name: {{ template "drone.fullname" . }}-agent
image: "{{ .Values.images.agent.repository }}:{{ .Values.images.agent.tag }}"
incubator/drone/templates/deployment-server.yaml
+4
View File
@@ -20,6 +20,10 @@ spec:
release: "{{ .Release.Name }}"
component: server
spec:
{{- if .Values.server.affinity }}
affinity:
{{ toYaml .Values.server.affinity | indent 8 }}
{{- end }}
containers:
- name: {{ template "drone.fullname" . }}-server
image: "{{ .Values.images.server.repository }}:{{ .Values.images.server.tag }}"
incubator/drone/values.yaml
+12 -2
View File
@@ -6,7 +6,7 @@ images:
##
server:
repository: "docker.io/drone/drone"
tag: 0.8.2
tag: 0.8.4
pullPolicy: IfNotPresent
## The official drone (agent) image, change tag to use a different version.
@@ -14,7 +14,7 @@ images:
##
agent:
repository: "docker.io/drone/agent"
tag: 0.8.2
tag: 0.8.4
pullPolicy: IfNotPresent
## The official docker (dind) image, change tag to use a different version.
@@ -97,6 +97,11 @@ server:
# memory: 2Gi
# cpu: 1
## Pod scheduling preferences.
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
##
affinity: {}
agent:
## Drone agent configuration.
## Values in here get injected as environment variables.
@@ -118,6 +123,11 @@ agent:
# memory: 2Gi
# cpu: 1
## Pod scheduling preferences.
## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
##
affinity: {}
dind:
## Docker storage driver.
## Your DinD instance should be using the same driver as your host.