.drone.yml

@@ -3,21 +3,15 @@ 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: git.cryptic.systems/volker.raschek/helm:3.16.1
+  image: docker.io/volkerraschek/helm:3.8.0
   resources:
     limits:
       cpu: 50
@@ -26,38 +20,27 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: git.cryptic.systems/volker.raschek/markdownlint:0.41.0
+  image: docker.io/volkerraschek/markdownlint:0.31.1
   resources:
     limits:
       cpu: 50
       memory: 50M
 
-- name: helm template
-  commands:
-  - helm template .
-  image: git.cryptic.systems/volker.raschek/helm:3.16.1
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
-
 - name: email-notification
   environment:
-    SMTP_FROM_ADDRESS:
+    PLUGIN_HOST:
-      from_secret: smtp_from_address
-    SMTP_FROM_NAME:
-      from_secret: smtp_from_name
-    SMTP_HOST:
       from_secret: smtp_host
-    SMTP_USERNAME:
+    PLUGIN_USERNAME:
       from_secret: smtp_username
-    SMTP_PASSWORD:
+    PLUGIN_PASSWORD:
       from_secret: smtp_password
-  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+    PLUGIN_FROM:
+      from_secret: smtp_mail_address
+  image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 150
+      cpu: 50
-      memory: 150M
+      memory: 25M
   when:
     status:
     - changed
@@ -69,38 +52,80 @@ 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 drone https://charts.cryptic.systems/drone
+  - helm repo add volker.raschek https://charts.cryptic.systems/volker.raschek
   - helm package --version ${DRONE_TAG} .
-  - helm cm-push ${DRONE_REPO_NAME%-charts}-${DRONE_TAG}.tgz drone
+  - helm cm-push ${DRONE_REPO_NAME%-charts}-${DRONE_TAG}.tgz volker.raschek
   environment:
     HELM_REPO_PASSWORD:
       from_secret: helm_repo_password
     HELM_REPO_USERNAME:
       from_secret: helm_repo_username
-  image: git.cryptic.systems/volker.raschek/helm:3.16.1
+  image: docker.io/volkerraschek/helm:3.8.0
-  resources:
-    limits:
-      cpu: 150
-      memory: 150M
 
 trigger:
   event:
   - tag
   repo:
   - volker.raschek/drone-runner-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-runner-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-runner-charts

Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: drone-runner
 description: Helm chart for a drone runner based on kubernetes
 type: application
-version: "0.4.0"
+version: "0.3.0"
-appVersion: "1.0.0-rc.3"
+appVersion: "1.0.0-rc.1"
 icon: https://readme.drone.io/logo.svg
 
 keywords:

README.md

@@ -1,23 +1,19 @@
 # drone-charts
 
 [![Build Status](https://drone.cryptic.systems/api/badges/volker.raschek/drone-runner-charts/status.svg)](https://drone.cryptic.systems/volker.raschek/drone-runner-charts)
-[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/drone-ce)](https://artifacthub.io/packages/search?repo=drone-ce)
+[![Artifact Hub](https://img.shields.io/endpoint?url=https://artifacthub.io/badge/repository/volker-raschek)](https://artifacthub.io/packages/search?repo=volker-raschek)
 
 This is an inofficial helm chart for
 [drone-runner](https://github.com/drone/drone-runner-kube) and should replace
-the official unmaintained helm chart
+the official unmainted helm chart
 [repository](https://github.com/drone/drone-runner-kube).
 
 This helm chart can be found on [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 drone https://charts.cryptic.systems/drone
+helm repo add volker.raschek https://charts.cryptic.systems/volker.raschek
-helm install drone drone/drone-runner
+helm install drone volker.raschek/drone-runner
 ```
 
 ## Customization

renovate.json

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

templates/deployment.yaml

@@ -5,7 +5,6 @@ metadata:
   labels:
     {{- include "droneRunner.labels" . | nindent 4 }}
 spec:
-  replicas: {{ .Values.replicaCount | default 1 }}
   selector:
     matchLabels:
       {{- include "droneRunner.selectorLabels" . | nindent 6 }}
@@ -38,7 +37,7 @@ spec:
           {{- toYaml .Values.resources | nindent 12 }}
         {{- if and (hasKey .Values.envFile "content") (hasKey .Values.config "DRONE_RUNNER_ENV_FILE") }}
         volumeMounts:
-        - name: custom-env-vars
+        - name: env-file
           mountPath: {{ dir .Values.config.DRONE_RUNNER_ENV_FILE }}
           readOnly: true
         {{- end}}
@@ -50,9 +49,6 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.podPriorityClassName }}
-      priorityClassName: {{ .Values.podPriorityClassName }}
-      {{- end }}
       serviceAccountName: {{ include "droneRunner.fullname" . }}
       {{- with .Values.tolerations }}
       tolerations:
@@ -60,10 +56,10 @@ spec:
       {{- end }}
       {{- if and (hasKey .Values.envFile "content") (hasKey .Values.config "DRONE_RUNNER_ENV_FILE") }}
       volumes:
-      - name: custom-env-vars
+      - name: env-file
         configMap:
           name: {{ include "droneRunner.fullname" . }}
           items:
-          - key: custom-env-vars
+          - key: {{ base .Values.config.DRONE_RUNNER_ENV_FILE }}
             path: {{ base .Values.config.DRONE_RUNNER_ENV_FILE }}
       {{- end}}

templates/envConfig.yaml

@@ -6,6 +6,6 @@ metadata:
     {{- include "droneRunner.labels" . | nindent 4 }}
   name: {{ include "droneRunner.fullname" . }}
 data:
-  custom-env-vars: |
+  {{ base .Values.config.DRONE_RUNNER_ENV_FILE }}: |
-    {{- .Values.envFile.content | nindent 4 }}
+    {{ .Values.envFile.content }}
 {{- end }}

values.yaml

@@ -16,8 +16,6 @@ fullnameOverride: ""
 
 podAnnotations: {}
 
-podPriorityClassName: ""
-
 podSecurityContext: {}
   # fsGroup: 2000
 
@@ -337,7 +335,7 @@ config: {}
   # DRONE_UI_USERNAME: ""
 
 envFile: {}
-  # content: |-
+  # content: |
   #   KEY=VALUE