Fetching upstream chart

.drone.yml

@@ -2,12 +2,20 @@ kind: pipeline
 type: docker
 name: default
 
+trigger:
+  branch:
+  - master
+
 steps:
 - name: lint
-  image: quay.io/helmpack/chart-testing:v3.0.0-beta.1
+  image: quay.io/helmpack/chart-testing:v3.5.0
   commands:
   - apk add --update make
-  - make lint
+  - ct lint
+# cloud.drone.io runners are using a version of docker prior to 20.10.0, so
+# this step currently fails due to this change in apline 3.14
+# https://wiki.alpinelinux.org/wiki/Release_Notes_for_Alpine_3.14.0#faccessat2
+#  - make lint
 
 - name: generate
   image: alpine/helm:3.0.3
@@ -45,3 +53,4 @@ steps:
     - push
     branch:
     - master
+

.editorconfig

@@ -0,0 +1,12 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = false
+insert_final_newline = false

.gitignore

@@ -35,3 +35,4 @@ Session.vim
 **/charts/*.tgz
 
 .history
+!.vscode

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations":[
+    "EditorConfig.EditorConfig",
+    "ms-kubernetes-tools.vscode-kubernetes-tools",
+    "redhat.vscode-yaml"
+  ]
+}

CONTRIBUTING.md

@@ -22,4 +22,4 @@ Contributors must follow the [Drone community code of conduct](CODE_OF_CONDUCT.m
 
 * Commit(s) should be prefixed by the name of the chart that has been added or modified.
 * `helm lint` must pass for all charts.
-* New charts must include a README.md. See [drone-runner-kube](charts/drone-runner-kube/README.md) for an example.  
+* New charts must include a README.md. See [drone-runner-docker](charts/drone-runner-docker/README.md) for an example.  

Makefile

@@ -9,7 +9,7 @@ publish:
 	@mkdir -p temp docs
 	@helm repo add stable https://charts.helm.sh/stable
 	@helm repo add incubator https://charts.helm.sh/incubator
-	@helm package -u -d temp charts/drone charts/drone-runner-kube charts/drone-kubernetes-secrets
+	@helm package -u -d temp charts/drone charts/drone-runner-docker charts/drone-kubernetes-secrets
 	@helm repo index --debug --url=https://charts.drone.io --merge docs/index.yaml temp
 	@mv temp/drone*.tgz docs
 	@mv temp/index.yaml docs/index.yaml

README.md

@@ -22,7 +22,7 @@ helm repo update
 See the the READMEs for the various charts in the [charts](charts) directory. 
 
 * If you have not yet installed Drone server, start with the [drone](charts/drone) chart.
-* After installing `drone`, install [drone-runner-kube](charts/drone-runner-kube) to begin executing builds.
+* After installing `drone`, install [drone-runner-docker](charts/drone-runner-docker) to begin executing builds.
 
 ## Documentation
 

charts/README.md

@@ -7,4 +7,4 @@ This directory contains the charts that are published to the Drone Helm chart re
 A nonexhaustive overview of the charts:
 
 * [drone](drone/README.md) - Drone server
-* [drone-runner-kube](drone-runner-kube/README.md) - The Kubernetes runner for Drone
+* [drone-runner-docker](drone-runner-docker/README.md) - The Docker runner for Drone

charts/drone-kubernetes-secrets/Chart.yaml

@@ -4,7 +4,7 @@ name: drone-kubernetes-secrets
 description: A Kubernetes Secrets extension for Drone
 # TODO: Un-comment once we move back to apiVersion: v2.
 # type: application
-version: 0.1.1
+version: 0.1.4
 appVersion: 1.0.0
 kubeVersion: "^1.13.0-0"
 home: https://github.com/drone/drone-kubernetes-secrets
@@ -19,7 +19,7 @@ keywords:
   - go
 sources:
   - https://github.com/drone/drone-kubernetes-secrets
-  - https://github.com/drone/helm
+  - https://github.com/drone/charts
 maintainers:
   - name: Drone
     email: [email protected]

charts/drone-kubernetes-secrets/docs/install.md

@@ -5,7 +5,6 @@ This page will guide you through using the `drone-kubernetes-secrets` Helm chart
 **Note: Before beginning installation, you should have functioning deploys of Drone server and the Kubernetes runner. Refer to the their respective charts if needed:**
 
 * [drone](../../drone/README.md)
-* [drone-runner-kube](../../drone-runner-kube/README.md)
 
 ## Configuration (values)
 
@@ -53,7 +52,6 @@ Once the `install` command is ran, your Kubernetes cluster will begin creating r
 $ kubectl --namespace drone get pods
 NAME                                        READY   STATUS    RESTARTS   AGE
 drone-76d6bb8968-2s5n9                      1/1     Running   0          1h
-drone-runner-kube-696cf7b8d6-pds2h          1/1     Running   0          10m
 drone-kubernetes-secrets-547799b4db-c58wv   1/1     Running   0          1m
 ```
 

charts/drone-kubernetes-secrets/templates/deployment.yaml

@@ -30,7 +30,7 @@ spec:
         - name: server
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           ports:
             - name: http

charts/drone-kubernetes-secrets/values.yaml

@@ -1,4 +1,5 @@
 image:
+  registry: docker.io
   repository: drone/kubernetes-secrets
   tag: latest
   pullPolicy: IfNotPresent

charts/drone-runner-kube/.helmignore → charts/drone-runner-docker/.helmignore

@@ -14,12 +14,10 @@
 *.swp
 *.bak
 *.tmp
+*.orig
 *~
 # Various IDEs
 .project
 .idea/
 *.tmproj
 .vscode/
-# Chart dirs/files
-docs/
-ci/

charts/drone-runner-kube/Chart.yaml → charts/drone-runner-docker/Chart.yaml

@@ -1,13 +1,13 @@
 # TODO: Change this back to v2 once chart-releaser supports it.
 apiVersion: v1
-name: drone-runner-kube
-description: The Drone Kubernetes runner launches builds in Kubernetes Jobs
+name: drone-runner-docker
+description: A Helm chart for the Drone Docker runner which uses Docker-in-Docker (dind)
 # TODO: Un-comment once we move back to apiVersion: v2.
 # type: application
-version: 0.1.5
-appVersion: 1.0.0
+version: 0.7.0
+appVersion: "1.8.1"
 kubeVersion: "^1.13.0-0"
-home: https://kube-runner.docs.drone.io/
+home: https://docs.drone.io/runner/docker/overview/
 icon: https://drone.io/apple-touch-icon.png
 keywords:
   - continuous-delivery
@@ -18,8 +18,8 @@ keywords:
   - drone.io
   - go
 sources:
-  - https://github.com/drone-runners/drone-runner-kube
-  - https://github.com/drone/helm
+  - https://github.com/drone-runners/drone-runner-docker
+  - https://github.com/drone/charts
 maintainers:
   - name: Drone
     email: [email protected]

charts/drone-runner-docker/README.md

@@ -0,0 +1,48 @@
+# Drone Docker runner
+
+[Drone](http://drone.io/) is a Continuous Integration platform built on container technology.
+
+This Chart is for installing the [Docker runner](https://docs.drone.io/runner/docker/) for Drone.
+
+## Installing Drone Docker runner
+
+See the [drone-runner-docker chart installation guide](./docs/install.md).
+
+## Configuring Drone Docker runner
+
+See [values.yaml](values.yaml) to see the Chart's default values. Refer to the [Docker runner reference](https://docs.drone.io/runner/docker/configuration/reference/) for a more complete list of options.
+
+:information_source: In addition to the Drone Docker runner container, this chart runs [Docker-in-Docker](https://hub.docker.com/_/docker) (to run Docker containers in pipelines) and [Drone GC](https://github.com/drone/drone-gc) (for automatically pruning Docker images) containers within the pod. 
+
+To adjust an existing Drone install's configuration:
+
+```console
+# If you have a values file:
+helm upgrade drone-runner-docker drone/drone-runner-docker --namespace drone --values drone-runner-docker-values.yaml
+# If you want to change one value and don't have a values file:
+helm upgrade drone-runner-docker drone/drone-runner-docker --namespace drone --reuse-values --set someKey=someVal
+```
+
+## Upgrading Drone Docker runner
+
+Read the [release notes](https://github.com/drone-runners/drone-runner-docker/releases) to make sure there are no backwards incompatible changes. Make adjustments to your values as needed, then run `helm upgrade`:
+
+```console
+# This pulls the latest version of the drone chart from the repo.
+helm repo update
+helm upgrade drone-runner-docker drone/drone-runner-docker --namespace drone --values drone-runner-docker-values.yaml
+```
+
+## Uninstalling Drone Docker runner
+
+To uninstall/delete the `drone` deployment in the `drone` namespace:
+
+```console
+helm delete drone-runner-docker --namespace drone
+```
+
+Substitute your values if they differ from the examples. See `helm delete --help` for a full reference on `delete` parameters and flags.
+
+## Support
+
+For questions, suggestions, and discussion, visit the [Drone community site](https://community.harness.io/c/drone).

charts/drone-runner-docker/docs/install.md

@@ -0,0 +1,120 @@
+# Drone Docker runner installation with Helm
+
+This page will guide you through using the `drone-runner-docker` Helm chart to install the Drone Docker runner.
+
+**Note: Before beginning installation, you should have a functioning deploy of Drone server. If you still need to install Drone server, complete an install of [drone](../../drone/README.md) before continuing.**
+
+## Disclaimer
+
+This page is not intended to be a comprehensive guide to installing the Drone Docker runner. It will only cover the Helm/Kubernetes-specific parts of the process. For further detail, see the Drone [Docker runner installation guide](https://docs.drone.io/runner/docker/overview/).
+
+## Configuration (values)
+
+**Note: This guide assumes that Drone and the Docker runner are installed in the `drone` namespace. Feel free to change this as desired, but we suggest putting Drone server and the Docker runner in the same namespace as a start.**
+
+The following command will create a new namespace called `drone`:
+
+```bash
+kubectl create namespace drone
+```
+
+In order to install the chart, you'll need to pass in additional configuration. This configuration comes in the form of Helm values, which are key/value pairs. A minimal install of Drone server requires the following values:
+
+```yaml
+env:
+  ## REQUIRED: Set the secret secret token that the Docker runner will use
+  ## to authenticate. This is commented out in order to leave you the ability to set the
+  ## key via a separately provisioned secret (see extraSecretNamesForEnvFrom above).
+  ## Ref: https://docs.drone.io/runner/docker/configuration/reference/drone-rpc-secret/
+  ##
+  ## NOTE TO READER: Change this to match the DRONE_RPC_SECRET secret set in your drone server configs.
+  DRONE_RPC_SECRET: xxxxxxxxxxxxx
+```
+
+Copy these into a new file, which we'll call `drone-runner-docker-values.yaml`. Adjust the included defaults to reflect your environment. For the ful list of configurables, see the [configuration reference](https://docs.drone.io/runner/docker/configuration/).
+
+### Docker-in-Docker MTU
+
+The Docker-in-Docker (dind) sidecar creates its own temporary networks as it executes Drone Docker pipelines. **The MTU of these networks must be smaller than the outer networking layer(s).** For more background, see this [blog post](https://blog.dustinrue.com/2020/08/fixing-dind-builds-that-stall-when-using-gitlab-and-kubernetes/).
+
+You should retrieve the MTU value of your Kubernetes cluster networking layer. **If it is smaller than 1500 (the default value for dind), you will need to pass some extra parameters.**
+
+Pass `--mtu` in the `dind.commandArgs` section of your `drone-runner-docker-values.yaml` file:
+
+```yaml
+dind:
+  commandArgs:
+    - "--host"
+    - "tcp://localhost:2375"
+    - "--mtu=12345"
+```
+
+Replace `12345` with your appropriate MTU value.
+
+To ensure that the temporary Docker networks created by the runner also have the appropriate value, add `DRONE_RUNNER_NETWORK_OPTS` to the `env` section of your `drone-runner-docker-values.yaml` file:
+
+```yaml
+env:
+  DRONE_RUNNER_NETWORK_OPTS: "com.docker.network.driver.mtu:12345"
+```
+
+Replace `12345` with your appropriate MTU value.
+
+Finally, if you are using the official [Drone Docker plugin](https://plugins.drone.io/plugins/docker) to build Docker images in your pipelines, it creates its own temporary Docker network, so its MTU must also be changed.
+
+In your Drone pipelines, add the `mtu` parameter:
+
+```yaml
+kind: pipeline
+type: docker
+name: default
+
+steps:
+- name: example
+  image: plugins/docker
+  settings:
+    mtu: 12345
+```
+
+Replace `12345` with your appropriate MTU value.
+
+## Run the installation
+
+Run `helm install` with your values provided:
+
+```console
+helm install --namespace drone drone-runner-docker drone/drone-runner-docker -f drone-runner-docker-values.yaml
+```
+
+To break down the above, this command means: "install the `drone/drone-runner-docker` chart as a Helm release named `drone-runner-docker` in the `drone` namespace. The `drone-runner-docker-values.yaml` file will be used for configuring Drone." See `helm install --help` for a full list of parameters and flags.
+
+Once the `install` command is ran, your Kubernetes cluster will begin creating resources. To see how your deploy is shaping up, run:
+
+```console
+$ kubectl --namespace drone get pods
+NAME                                 READY   STATUS    RESTARTS   AGE
+drone-76d6bb8968-2s5n9               1/1     Running   0          1h
+drone-runner-docker-696cf7b8d6-pds2h 1/1     Running   0          1m
+```
+
+If the `drone-runner-*` pod's state is `Running`, the runner process successfully launched. Check the logs to make sure there are no warnings or errors:
+
+```console
+$ kubectl --namespace drone logs \
+    -l 'app.kubernetes.io/name=drone-runner-docker' \
+    -l 'app.kubernetes.io/component=drone-runner-docker'
+
+time="2022-05-04T16:59:44Z" level=info msg="starting the server" addr=":3000"
+time="2022-05-04T16:59:44Z" level=info msg="successfully pinged the remote server"
+time="2022-05-04T16:59:44Z" level=info msg="polling the remote server" arch=amd64 capacity=2 endpoint="http://drone" kind=pipeline os=linux type=docker
+```
+
+If you see the "starting the server" text above without error, the Drone Docker runner is ready.
+
+## Next steps
+
+Now that Drone server and the Drone Docker runner are installed, you are ready to begin submitting CI builds. Refer to the [Docker runner documentation](https://docs.drone.io/pipeline/docker/overview/) for more information on how to proceed.
+
+## Help
+
+If you have questions or have encountered issues, visit the [Drone community site](https://community.harness.io/c/drone/14) to share.

charts/drone-runner-docker/templates/NOTES.txt

@@ -0,0 +1,22 @@
+1. Get the application URL by running these commands:
+{{- if .Values.ingress.enabled }}
+{{- range $host := .Values.ingress.hosts }}
+  {{- range .paths }}
+  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
+  {{- end }}
+{{- end }}
+{{- else if contains "NodePort" .Values.service.type }}
+  export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "drone-runner-docker.fullname" . }})
+  export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+  echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+           You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "drone-runner-docker.fullname" . }}'
+  export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "drone-runner-docker.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+  echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+  export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "drone-runner-docker.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+  export CONTAINER_PORT=$(kubectl get pod --namespace {{ .Release.Namespace }} $POD_NAME -o jsonpath="{.spec.containers[0].ports[0].containerPort}")
+  echo "Visit http://127.0.0.1:8080 to use your application"
+  kubectl --namespace {{ .Release.Namespace }} port-forward $POD_NAME 8080:$CONTAINER_PORT
+{{- end }}