fix(renovate): use presets

Reviewed-on: #34

.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: quay.io/helmpack/chart-testing:latest
+  image: git.cryptic.systems/volker.raschek/helm:3.17.1
   resources:
     limits:
       cpu: 50
@@ -20,27 +26,38 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.30.0
+  image: git.cryptic.systems/volker.raschek/markdownlint:0.44.0
   resources:
     limits:
       cpu: 50
       memory: 50M
 
-- 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
+- name: helm template
+  commands:
+  - helm template .
+  image: git.cryptic.systems/volker.raschek/helm:3.17.1
   resources:
     limits:
-      cpu: 50
-      memory: 25M
+      cpu: 150
+      memory: 150M
+
+- name: email-notification
+  environment:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
+      from_secret: smtp_host
+    SMTP_USERNAME:
+      from_secret: smtp_username
+    SMTP_PASSWORD:
+      from_secret: smtp_password
+  image: git.cryptic.systems/volker.raschek/drone-email:0.1.5
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
   when:
     status:
     - changed
@@ -52,81 +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.4.0
+
 - name: release-helm-chart
   commands:
-  - helm plugin install https://github.com/chartmuseum/helm-push.git
-  - 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/alpine/helm:3.7.2
+  image: git.cryptic.systems/volker.raschek/helm:3.17.1
+  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.3.0"
-appVersion: "1.0.0-rc.1"
+version: "0.4.0"
+appVersion: "1.0.0-rc.3"
 icon: https://readme.drone.io/logo.svg
 
 keywords:

README.md

@@ -1,19 +1,22 @@
 # 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/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-runner](https://github.com/drone/drone-runner-kube) and should replace
-the official unmainted helm chart
+the official unmaintained 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 volker.raschek https://charts.cryptic.systems/volker.raschek
-helm install drone volker.raschek/drone-runner
+helm repo add drone https://charts.cryptic.systems/drone
+helm install drone drone/drone-runner
 ```
 
 ## Customization

renovate.json

@@ -1,19 +1,68 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "automergeStrategy": "merge-commit",
-  "automergeType": "pr",
-  "assignees": [ "volker.raschek" ],
-  "regexManagers": [
+  "extends": [
+    "local>volker.raschek/renovate-config:default#master",
+    "local>volker.raschek/renovate-config:container#master",
+    "local>volker.raschek/renovate-config:actions#master",
+    "local>volker.raschek/renovate-config:npm#master",
+    "local>volker.raschek/renovate-config:regexp#master"
+  ],
+  "customManagers": [
     {
-      "description": "Update container image reference",
       "fileMatch": [
         "^Chart\\.yaml$"
       ],
       "matchStrings": [
         "appVersion: \"(?<currentValue>.*?)\"\\s+"
       ],
-      "depNameTemplate": "docker.io/drone/drone-runner-kube",
-      "datasourceTemplate": "docker"
+      "datasourceTemplate": "docker",
+      "depNameTemplate": "drone/drone-runner-kube",
+      "lookupNameTemplate": "docker.io/drone/drone-runner-kube",
+      "versioningTemplate": "semver"
+    },
+    {
+      "fileMatch": ["^README\\.md$"],
+      "matchStrings": [
+        "CHART_VERSION=(?<currentValue>.*)"
+      ],
+      "depNameTemplate": "volker.raschek/drone-runner-charts",
+      "packageNameTemplate": "https://git.cryptic.systems/volker.raschek/drone-runner-charts",
+      "datasourceTemplate": "git-tags",
+      "versioningTemplate": "semver"
+    }
+  ],
+  "packageRules": [
+    {
+      "addLabels": [
+        "renovate/automerge",
+        "renovate/container"
+      ],
+      "automerge": true,
+      "excludePackagePatterns": [
+        "drone/drone-runner-kube"
+      ],
+      "matchDatasources": [
+        "docker"
+      ],
+      "matchUpdateTypes": [
+        "minor",
+        "patch"
+      ]
+    },
+    {
+      "addLabels": [
+        "renovate/automerge",
+        "renovate/documentation"
+      ],
+      "automerge": true,
+      "matchDepNames": [
+        "volker.raschek/drone-runner-charts"
+      ],
+      "matchUpdateTypes": [
+        "major",
+        "minor",
+        "patch"
+      ]
     }
   ]
 }

templates/deployment.yaml

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

values.yaml

@@ -16,6 +16,8 @@ fullnameOverride: ""
 
 podAnnotations: {}
 
+podPriorityClassName: ""
+
 podSecurityContext: {}
   # fsGroup: 2000
 
@@ -27,7 +29,7 @@ securityContext: {}
   # runAsNonRoot: true
   # runAsUser: 1000
 
-config:
+config: {}
   # DRONE_ANNOTATIONS_DEFAULT
   # Optional string map. Provides a set of default annotations used when
   # creating the pipeline pod. The default annotation values are appended to the
@@ -335,7 +337,7 @@ config:
   # DRONE_UI_USERNAME: ""
 
 envFile: {}
-  # content: |
+  # content: |-
   #   KEY=VALUE