Merge pull request 'chore(deps): update drone docker tag to v2.25.0' (#74) from renovate/drone-2.x into master

Reviewed-on: #74

.drone.yml

@@ -3,15 +3,21 @@ 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.4.0
+
 - name: helm lint
   commands:
   - helm lint
-  image: docker.io/volkerraschek/helm:3.9.4
+  image: git.cryptic.systems/volker.raschek/helm:3.16.4
   resources:
     limits:
       cpu: 150
@@ -20,7 +26,7 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.32.2
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.43.0
   resources:
     limits:
       cpu: 150
@@ -29,7 +35,7 @@ steps:
 - name: helm template
   commands:
   - helm template .
-  image: docker.io/volkerraschek/helm:3.9.4
+  image: git.cryptic.systems/volker.raschek/helm:3.16.4
   resources:
     limits:
       cpu: 150
@@ -47,7 +53,7 @@ steps:
       from_secret: smtp_username
     SMTP_PASSWORD:
       from_secret: smtp_password
-  image: docker.io/volkerraschek/drone-email:0.1.1
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
   resources:
     limits:
       cpu: 150
@@ -67,21 +73,28 @@ kind: pipeline
 type: kubernetes
 name: release
 
+clone:
+  disable: true
+
 platform:
   os: linux
 
 steps:
+- name: clone
+  image: git.cryptic.systems/volker.raschek/git:1.4.0
+
 - name: release-helm-chart
   commands:
-  - helm repo add volker.raschek https://charts.cryptic.systems/volker.raschek
+  - grep -o 'version:"${DRONE_TAG}"' Chart.yaml || echo "Version ${DRONE_TAG} not found in Chart.yaml"
+  - 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.9.4
+  image: git.cryptic.systems/volker.raschek/helm:3.16.4
   resources:
     limits:
       cpu: 150

Chart.yaml

@@ -2,16 +2,17 @@ apiVersion: v2
 name: drone
 description: Drone Helm chart for Kubernetes
 type: application
-version: "0.7.1"
+version: "0.8.2"
-appVersion: "2.12.1"
+appVersion: "2.25.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)           |

renovate.json

@@ -1,7 +1,5 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "automergeStrategy": "merge-commit",
-  "automergeType": "pr",
   "assignees": [ "volker.raschek" ],
   "labels": [ "renovate" ],
   "packageRules": [

templates/deployment.yaml

@@ -5,6 +5,11 @@ metadata:
   labels:
     {{- include "drone.labels" . | nindent 4 }}
 spec:
+  {{- if .Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3" }}
+  replicas: 1
+  {{- else }}
+  replicas: {{ .Values.replicas | default 1 }}
+  {{- end }}
   selector:
     matchLabels:
       {{- include "drone.selectorLabels" . | nindent 6 }}
@@ -17,20 +22,21 @@ spec:
       labels:
         {{- include "drone.selectorLabels" . | nindent 8 }}
     spec:
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       containers:
         - name: {{ .Chart.Name }}
           envFrom:
           - secretRef:
               name: {{ include "drone.fullname" . }}
-          securityContext:
-            {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          {{- with .Values.livenessProbe }}
           livenessProbe:
-            httpGet:
+            {{- toYaml . | nindent 12 }}
-              scheme: HTTP
+          {{- end }}
-              path: /healthz
-              port: http
           ports:
           - name: http
             containerPort: 80
@@ -38,14 +44,15 @@ spec:
           - name: https
             containerPort: 443
             protocol: TCP
+          {{- with .Values.readinessProbe }}
           readinessProbe:
-            httpGet:
+            {{- toYaml . | nindent 12 }}
-              scheme: HTTP
+          {{- end }}
-              path: /healthz
-              port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if .Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3" }}
+          securityContext:
+            {{- toYaml .Values.securityContext | nindent 12 }}
           volumeMounts:
           - name: data
             mountPath: {{ default "/data/database.sqlite" .Values.config.DRONE_DATABASE_DATASOURCE | dir }}
@@ -58,8 +65,8 @@ spec:
             {{- toYaml . | nindent 10 }}
           {{- end }}
           {{- end }}
-      {{- with .Values.affinity }}
+      {{- with .Values.initContainers }}
-      affinity:
+      initContainers:
         {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.imagePullSecrets }}

values.yaml

@@ -16,21 +16,16 @@ podAnnotations: {}
 
 podPriorityClassName: ""
 
-podSecurityContext:
+podSecurityContext: {}
-  {}
   # fsGroup: 2000
 
-securityContext:
+# Increasing the amount of replicas has no effect, when `DRONE_DATABASE_DRIVER`
-  {}
+# is set to sqlite3.
-  # capabilities:
+replicas: 1
-  #   drop:
-  #   - ALL
-  # readOnlyRootFilesystem: true
-  # runAsNonRoot: true
-  # runAsUser: 1000
 
-config:
+affinity: {}
-  {}
+
+config: {}
   # DRONE_BITBUCKET_CLIENT_ID
   # String value. Configures the Bitbucket OAuth client id. This is used to
   # authorize access to Bitbucket on behalf of a Drone user.
@@ -523,22 +518,6 @@ config:
   # https://docs.drone.io/server/reference/drone-webhook-skip-verify/
   # DRONE_WEBHOOK_SKIP_VERIFY: ""
 
-serviceAccount:
-  annotations: {}
-
-service:
-  annotations: {}
-  # externalIPs: []
-  # externalTrafficPolicy: "Cluster"
-  # loadBalancerClass: ""
-  # loadBalancerIP: ""
-  # loadBalancerSourceRanges: []
-  # internalTrafficPolicy: "Cluster"
-  name: http
-  targetPort: 80
-  type: ClusterIP
-  port: 80
-
 ingress:
   enabled: false
   className: "nginx"
@@ -556,8 +535,23 @@ ingress:
       hosts:
         - "your-hostname"
 
-resources:
+initContainers: []
-  {}
+
+livenessProbe:
+  httpGet:
+    scheme: HTTP
+    path: /healthz
+    port: http
+
+nodeSelector: {}
+
+readinessProbe:
+  httpGet:
+    scheme: HTTP
+    path: /healthz
+    port: http
+
+resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
   # resources, such as Minikube. If you do want to specify resources, uncomment the following
@@ -569,12 +563,32 @@ resources:
   #   cpu: 100m
   #   memory: 128Mi
 
-nodeSelector: {}
+securityContext: {}
+  # capabilities:
+  #   drop:
+  #   - ALL
+  # readOnlyRootFilesystem: true
+  # runAsNonRoot: true
+  # runAsUser: 1000
+
+serviceAccount:
+  annotations: {}
+
+service:
+  annotations: {}
+  # externalIPs: []
+  # externalTrafficPolicy: "Cluster"
+  # loadBalancerClass: ""
+  # loadBalancerIP: ""
+  # loadBalancerSourceRanges: []
+  # internalTrafficPolicy: "Cluster"
+  name: http
+  targetPort: 80
+  type: ClusterIP
+  port: 80
 
 tolerations: []
 
-affinity: {}
-
 # persistence is only required when config.DATABASE_DRIVER is sqlite3 or
 # undefined.
 persistence: