diff --git a/incubator/drone/Chart.yaml b/incubator/drone/Chart.yaml index 8a87d7d30e..3c0287ad8e 100755 --- a/incubator/drone/Chart.yaml +++ b/incubator/drone/Chart.yaml @@ -1,7 +1,7 @@ name: drone home: https://drone.io/ icon: http://docs.drone.io/logo.svg -version: 0.2.0 +version: 0.2.1 appVersion: 0.8.2 description: Drone is a Continuous Delivery system built on container technology keywords: diff --git a/incubator/drone/README.md b/incubator/drone/README.md index 104e6313d3..086c75d019 100644 --- a/incubator/drone/README.md +++ b/incubator/drone/README.md @@ -55,6 +55,8 @@ The following tables lists the configurable parameters of the drone charts and t | `server.resources` | Drone **server** pod resource requests & limits | `{}` | | `agent.env` | Drone **agent** environment variables | `(default values)` | | `agent.resources` | Drone **agent** pod resource requests & limits | `{}` | +| `dind.driver` | **DinD** storage driver | `overlay2` | +| `dind.resources` | **DinD** pod resource requests & limits | `{}` | | `persistence.enabled` | Use a PVC to persist data | `true` | | `persistence.existingClaim` | Use an existing PVC to persist data | `nil` | | `persistence.storageClass` | Storage class of backing PVC | `nil` | diff --git a/incubator/drone/templates/deployment-agent.yaml b/incubator/drone/templates/deployment-agent.yaml index 740ad77857..1a7acaf980 100644 --- a/incubator/drone/templates/deployment-agent.yaml +++ b/incubator/drone/templates/deployment-agent.yaml @@ -42,9 +42,11 @@ spec: imagePullPolicy: {{ .Values.images.dind.pullPolicy }} env: - name: DOCKER_DRIVER - value: overlay + value: {{ .Values.dind.driver }} securityContext: privileged: true + resources: +{{ toYaml .Values.dind.resources | indent 10 }} volumeMounts: - name: docker-graph-storage mountPath: /var/lib/docker diff --git a/incubator/drone/values.yaml b/incubator/drone/values.yaml index 3aa80d08da..b8e0a42f99 100644 --- a/incubator/drone/values.yaml +++ b/incubator/drone/values.yaml @@ -115,6 +115,23 @@ agent: # memory: 2Gi # cpu: 1 +dind: + ## Docker storage driver. + ## Your DinD instance should be using the same driver as your host. + ## ref: https://docs.docker.com/engine/userguide/storagedriver/selectadriver/ + ## + driver: overlay2 + + ## CPU and memory limits for dind + ## + resources: {} + # requests: + # memory: 32Mi + # cpu: 40m + # limits: + # memory: 2Gi + # cpu: 1 + ## Enable persistence using Persistent Volume Claims ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ ##