Merge pull request 'chore(deps): update dependency docker.io/volkerraschek/helm to v3.9.0' (#9) from renovate/docker.io-volkerraschek-helm-3.x into master

Reviewed-on: #9

.drone.yml

@@ -11,7 +11,7 @@ steps:
 - name: helm lint
   commands:
   - helm lint
-  image: quay.io/helmpack/chart-testing:latest
+  image: docker.io/volkerraschek/helm:3.9.0
   resources:
     limits:
       cpu: 50
@@ -20,7 +20,7 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.30.0
+  image: docker.io/volkerraschek/markdownlint:0.31.1
   resources:
     limits:
       cpu: 50
@@ -52,7 +52,6 @@ trigger:
     - tag
 
 ---
-
 kind: pipeline
 type: kubernetes
 name: release
@@ -63,7 +62,6 @@ platform:
 steps:
 - 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 package --version ${DRONE_TAG} .
   - helm cm-push ${DRONE_REPO_NAME%-charts}-${DRONE_TAG}.tgz volker.raschek
@@ -72,61 +70,14 @@ steps:
       from_secret: helm_repo_password
     HELM_REPO_USERNAME:
       from_secret: helm_repo_username
-  image: docker.io/alpine/helm:3.7.2
+  image: docker.io/volkerraschek/helm:3.9.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.3.0"
+version: "0.4.0"
-appVersion: "1.0.0-rc.1"
+appVersion: "1.0.0-rc.3"
 icon: https://readme.drone.io/logo.svg
 
 keywords:

renovate.json

@@ -3,6 +3,23 @@
   "automergeStrategy": "merge-commit",
   "automergeType": "pr",
   "assignees": [ "volker.raschek" ],
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/drone-runner", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    },
+    {
+      "addLabels": [ "renovate/drone-runner", "renovate/automerge" ],
+      "automerge": false,
+      "matchPackageNames": [ "drone-runner" ],
+      "matchManagers": [ "regex" ]
+    }
+  ],
+  "rebaseLabel": "renovate/rebase",
+  "rebaseWhen": "behind-base-branch",
   "regexManagers": [
     {
       "description": "Update container image reference",
@@ -12,8 +29,9 @@
       "matchStrings": [
         "appVersion: \"(?<currentValue>.*?)\"\\s+"
       ],
-      "depNameTemplate": "docker.io/drone/drone-runner-kube",
+      "datasourceTemplate": "docker",
-      "datasourceTemplate": "docker"
+      "depNameTemplate": "drone-runner",
+      "lookupNameTemplate": "docker.io/drone/drone-runner-kube"
     }
   ]
-}
+}

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 }}: |
+  custom-env-vars: |
-    {{ .Values.envFile.content }}
+    {{- .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