Merge pull request #12 from pi3ch/patch-1

Bumped drone to 2.21.0

.drone.yml

@@ -3,44 +3,61 @@ kind: pipeline
 type: kubernetes
 name: linter
 
+clone:
+  disable: true
+
 platform:
   os: linux
   arch: amd64
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: helm lint
   commands:
   - helm lint
-  image: docker.io/volkerraschek/helm:3.8.1
+  image: git.cryptic.systems/volker.raschek/helm:3.13.3
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 50M
+      memory: 150M
 
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.31.1
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.38.0
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 50M
+      memory: 150M
+
+- name: helm template
+  commands:
+  - helm template .
+  image: git.cryptic.systems/volker.raschek/helm:3.13.3
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
 
 - name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -52,80 +69,38 @@ trigger:
     - tag
 
 ---
-
 kind: pipeline
 type: kubernetes
 name: release
 
+clone:
+  disable: true
+
 platform:
   os: linux
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.3.1
+
 - name: release-helm-chart
   commands:
-  - helm repo add volker.raschek https://charts.cryptic.systems/volker.raschek
+  - helm repo add drone https://charts.cryptic.systems/drone
   - helm package --version ${DRONE_TAG} .
-  - helm cm-push ${DRONE_REPO_NAME%-charts}-${DRONE_TAG}.tgz volker.raschek
+  - helm cm-push ${DRONE_REPO_NAME%-charts}-${DRONE_TAG}.tgz drone
   environment:
     HELM_REPO_PASSWORD:
       from_secret: helm_repo_password
     HELM_REPO_USERNAME:
       from_secret: helm_repo_username
-  image: docker.io/volkerraschek/helm:3.8.1
+  image: git.cryptic.systems/volker.raschek/helm:3.13.3
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
 
 trigger:
   event:
   - tag
   repo:
   - volker.raschek/drone-charts
-
----
-kind: pipeline
-type: kubernetes
-name: sync
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-- name: github
-  image: docker.io/appleboy/drone-git-push:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  settings:
-    branch: master
-    remote: ssh://git@github.com/volker-raschek/drone-charts.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
-
-- name: email-notification
-  environment:
-    PLUGIN_HOST:
-      from_secret: smtp_host
-    PLUGIN_USERNAME:
-      from_secret: smtp_username
-    PLUGIN_PASSWORD:
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      from_secret: smtp_mail_address
-  image: docker.io/drillster/drone-email:latest
-  resources:
-    limits:
-      cpu: 50
-      memory: 25M
-  when:
-    status:
-    - changed
-    - failure
-
-trigger:
-  branch:
-  - master
-  event:
-  - push
-  repo:
-  - volker.raschek/drone-charts

Chart.yaml

@@ -2,16 +2,17 @@ apiVersion: v2
 name: drone
 description: Drone Helm chart for Kubernetes
 type: application
-version: "0.5.0"
+version: "0.7.1"
-appVersion: "2.11.1"
+appVersion: "2.21.0"
 icon: https://readme.drone.io/logo.svg
 
 keywords:
-- git
+- continuous-delivery
+- continuous-deployment
+- continuous-integration
 - drone
 - drone-runner
-- ci
+- git
-- cd
 
 sources:
 - https://github.com/volker-raschek/drone-charts

README.md

@@ -1,26 +1,39 @@
 # drone-charts
 
 [![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/drone-charts/status.svg)](https://drone.cryptic.systems/volker.raschek/drone-charts)
-[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/volker-raschek)](https://artifacthub.io/packages/search?repo=volker-raschek)
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/drone-ce)](https://artifacthub.io/packages/search?repo=drone-ce)
 
 This is an inofficial helm chart for [drone](https://github.com/drone/drone) and
-should replace the official unmainted helm chart
+was created because the official helmet chart was not maintained for a long
-[repository](https://github.com/drone/charts). The official does not support
+time - [Issue](https://github.com/drone/charts/issues/46).
-version `v2` of drone.
 
-This helm chart can be found on [artifacthub.io](https://artifacthub.io/) and
+This helm chart is maintained by contributors and myself. It is listed on
-can be installed via helm.
+[artifacthub.io](https://artifacthub.io/) and can be installed via helm:
+
+> The repository has been changed and causes error messages when interacting
+> with the old repository definition. Please remove the chart repo
+> `volker.raschek` and replace it with `drone`.
 
 ```bash
-helm repo add volker.raschek https://charts.cryptic.systems/volker.raschek
+helm repo add drone https://charts.cryptic.systems/drone
-helm install drone volker.raschek/drone
+helm install drone drone/drone
 ```
 
 ## Customization
 
 All [configuration options](https://docs.drone.io/server/reference/) can be
 defined in the `values.yml` file below the `config` section. Alternatively can
-be the options passed via the `--set` flag of the `helm install` command.
+be the options passed via the `--set` flag of the `helm install` command. For
+example:
+
+```bash
+helm install drone drone/drone \
+  --set config.DRONE_RPC_SECRET-${DRONE_RPC_SECRET} \
+  --set config.DRONE_GITHUB_CLIENT_ID=${DRONE_GITHUB_CLIENT_ID} \
+  --set config.DRONE_GITHUB_CLIENT_SECRET=${DRONE_GITHUB_CLIENT_SECRET}
+```
+
+### List of config options
 
 | value                                                   | reference                                                                                 |
 | ------------------------------------------------------- | ----------------------------------------------------------------------------------------- |
@@ -83,6 +96,7 @@ be the options passed via the `--set` flag of the `helm install` command.
 | `config.DRONE_SERVER_PROXY_HOST`                        | [Documentation](https://docs.drone.io/server/reference/drone-server-proxy-host)           |
 | `config.DRONE_SERVER_PROXY_PROTO`                       | [Documentation](https://docs.drone.io/server/reference/drone-server-proxy-proto)          |
 | `config.DRONE_STARLARK_ENABLED`                         | [Documentation](https://docs.drone.io/server/reference/drone-starlark-enabled)            |
+| `config.DRONE_STARLARK_SIZE_LIMIT`                      | [Documentation](https://github.com/harness/drone/pull/3291)                               |
 | `config.DRONE_STARLARK_STEP_LIMIT`                      | [Documentation](https://docs.drone.io/server/reference/drone-starlark-step-limit)         |
 | `config.DRONE_STASH_CONSUMER_KEY`                       | [Documentation](https://docs.drone.io/server/reference/drone-stash-consumer-key)          |
 | `config.DRONE_STASH_PRIVATE_KEY`                        | [Documentation](https://docs.drone.io/server/reference/drone-stash-private-key)           |

templates/deployment.yaml

@@ -26,16 +26,37 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          livenessProbe:
+            httpGet:
+              scheme: HTTP
+              path: /healthz
+              port: http
           ports:
-            - name: http
+          - name: http
-              containerPort: 80
+            containerPort: 80
-              protocol: TCP
+            protocol: TCP
+          - name: https
+            containerPort: 443
+            protocol: TCP
+          readinessProbe:
+            httpGet:
+              scheme: HTTP
+              path: /healthz
+              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if .Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3" }}
           volumeMounts:
           - name: data
             mountPath: {{ default "/data/database.sqlite" .Values.config.DRONE_DATABASE_DATASOURCE | dir }}
+          {{- with .Values.extraVolumeMounts }}
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
+          {{- else }}
+          {{- with .Values.extraVolumeMounts }}
+          volumeMounts:
+            {{- toYaml . | nindent 10 }}
+          {{- end }}
           {{- end }}
       {{- with .Values.affinity }}
       affinity:
@@ -66,9 +87,20 @@ spec:
       {{- with .Values.persistence.existingClaim }}
           claimName: {{ tpl . $ }}
       {{- end }}
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
       {{- else if and (.Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3") (not .Values.persistence.existingClaim) }}
       volumes:
       - name: data
         persistentVolumeClaim:
           claimName: {{ include "drone.fullname" . }}
+      {{- with .Values.extraVolumes }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- else }}
+      {{- with .Values.extraVolumes }}
+      volumes:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- end }}

templates/persistentVolumeClaim.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.persistence.enabled -}}
 {{ if and (.Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3") (not .Values.persistence.existingClaim) }}
 apiVersion: v1
 kind: PersistentVolumeClaim
@@ -14,4 +15,5 @@ spec:
   {{- if .Values.persistence.storageClass }}
   storageClassName: {{ .Values.persistence.storageClass | quote }}
   {{- end }}
-{{- end }}
+{{- end }}
+{{- end -}}

templates/service.yaml

@@ -9,11 +9,28 @@ metadata:
     {{- include "drone.labels" . | nindent 4 }}
   name: {{ include "drone.fullname" . }}
 spec:
+  {{- with .Values.service.externalIPs }}
+  externalIPs:
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
+  {{- if .Values.service.externalTrafficPolicy }}
+  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
+  {{- end }}
+  {{- if and .Values.service.loadBalancerClass (eq .Values.service.type "LoadBalancer") }}
+  loadBalancerClass: {{ .Values.service.loadBalancerClass }}
+  {{- end }}
+  {{- if and .Values.service.loadBalancerIP (eq .Values.service.type "LoadBalancer") }}
+  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
+  {{- end }}
+  {{- with .Values.service.loadBalancerSourceRanges }}
+  loadBalancerSourceRanges:
+  {{- toYaml . | nindent 2 }}
+  {{- end }}
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: http
+      targetPort: {{ .Values.service.targetPort }}
       protocol: TCP
-      name: http
+      name: {{ .Values.service.name }}
   selector:
     {{- include "drone.selectorLabels" . | nindent 4 }}

values.yaml

@@ -2,8 +2,6 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-replicaCount: 1
-
 image:
   repository: docker.io/drone/drone
   pullPolicy: IfNotPresent
@@ -527,6 +525,14 @@ serviceAccount:
 
 service:
   annotations: {}
+  # externalIPs: []
+  # externalTrafficPolicy: "Cluster"
+  # loadBalancerClass: ""
+  # loadBalancerIP: ""
+  # loadBalancerSourceRanges: []
+  # internalTrafficPolicy: "Cluster"
+  name: http
+  targetPort: 80
   type: ClusterIP
   port: 80
 
@@ -538,14 +544,14 @@ ingress:
     # cert-manager.io/issuer:
     # kubernetes.io/tls-acme: "true"
   hosts:
-  - host: "your-hostname"
+    - host: "your-hostname"
-    paths:
+      paths:
-    - path: /
+        - path: /
-      pathType: ImplementationSpecific
+          pathType: ImplementationSpecific
   tls:
-  - secretName: "your-tls-secret"
+    - secretName: "your-tls-secret"
-    hosts:
+      hosts:
-    - "your-hostname"
+        - "your-hostname"
 
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
@@ -568,10 +574,43 @@ affinity: {}
 # persistence is only required when config.DATABASE_DRIVER is sqlite3 or
 # undefined.
 persistence:
+  enabled: true
+  annotation: {}
   # existingClaim:
   size: 5Gi
   accessModes:
-  - ReadWriteOnce
+    - ReadWriteOnce
   labels: {}
-  annotation: {}
+  # storageClass:
-  # storageClass:
+
+# extra volumes for the pod
+extraVolumes: {}
+# The following example mount the same secret, which contains tls certificates
+# under different names. Each volume mount contains only selected items of the
+# secret. This make it easier to place the items on different locations inside the
+# container filesystem via extraVolumeMounts.
+# - name: custom-ca-anchor
+#   secret:
+#     secretName: drone-custom-tls-certificates
+#     items:
+#     - key: ca.crt
+#       path: ca.crt
+#       mode: 0444
+# - name: custom-tls-certificates
+#   secret:
+#     secretName: drone-custom-tls-certificates
+#     items:
+#     - key: tls.key
+#       path: tls.key
+#       mode: 0400
+#     - key: tls.crt
+#       path: tls.crt
+#       mode: 0444
+
+extraVolumeMounts: {}
+# The following example follows the example of extraVolumes and mounts the
+# volumes to the corresponding paths in the container filesystem.
+# - name: custom-ca-anchor
+#   mountPath: /usr/local/share/ca-certificates
+# - name: custom-tls-certificates
+#   mountPath: /etc/drone/tls