Merge pull request 'chore(deps): update dependency roundcubemail to v1.5.3' (#11) from renovate/roundcubemail-1.x into master

Reviewed-on: #11

.drone.yml

@@ -11,20 +11,29 @@ 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
+      cpu: 150
-      memory: 50M
+      memory: 150M
 
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.28.1
+  image: docker.io/volkerraschek/markdownlint:0.31.1
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 50M
+      memory: 150M
+
+- name: helm template
+  commands:
+  - helm template .
+  image: docker.io/volkerraschek/helm:3.9.0
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
 
 - name: email-notification
   environment:
@@ -39,8 +48,8 @@ steps:
   image: docker.io/drillster/drone-email:latest
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 25M
+      memory: 150M
   when:
     status:
     - changed
@@ -54,50 +63,30 @@ trigger:
 ---
 kind: pipeline
 type: kubernetes
-name: sync
+name: release
 
 platform:
   os: linux
-  arch: amd64
 
 steps:
-- name: github
+- name: release-helm-chart
-  image: docker.io/appleboy/drone-git-push:latest
+  commands:
-  resources:
+  - helm repo add volker.raschek https://charts.cryptic.systems/volker.raschek
-    limits:
+  - helm package --version ${DRONE_TAG} .
-      cpu: 50
+  - helm cm-push ${DRONE_REPO_NAME%-charts}-${DRONE_TAG}.tgz volker.raschek
-      memory: 25M
-  settings:
-    branch: master
-    remote: ssh://git@github.com/volker-raschek/roundcube-charts.git
-    force: true
-    ssh_key:
-      from_secret: ssh_key
-
-- name: email-notification
   environment:
-    PLUGIN_HOST:
+    HELM_REPO_PASSWORD:
-      from_secret: smtp_host
+      from_secret: helm_repo_password
-    PLUGIN_USERNAME:
+    HELM_REPO_USERNAME:
-      from_secret: smtp_username
+      from_secret: helm_repo_username
-    PLUGIN_PASSWORD:
+  image: docker.io/volkerraschek/helm:3.9.0
-      from_secret: smtp_password
-    PLUGIN_FROM:
-      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
-    - failure
 
 trigger:
-  branch:
-  - master
   event:
-  - push
+  - tag
   repo:
   - volker.raschek/roundcube-charts

Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: roundcube
 description: Helm chart for roundcube
 type: application
-version: "0.1.0"
+version: "0.2.1"
-appVersion: "1.4.11-apache"
+appVersion: "1.5.3-apache"
 icon: https://upload.wikimedia.org/wikipedia/commons/e/e3/Roundcube_logo_icon.svg
 
 keywords:

renovate.json

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

templates/deployment.yaml

@@ -47,13 +47,16 @@ spec:
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
+      {{- with .Values.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- with .Values.affinity }}
+      {{- if .Values.podPriorityClassName }}
-      affinity:
+      priorityClassName: {{ .Values.podPriorityClassName }}
-        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with .Values.tolerations }}
       tolerations:

values.yaml

@@ -22,6 +22,8 @@ serviceAccount:
 
 podAnnotations: {}
 
+podPriorityClassName: ""
+
 podSecurityContext: {}
   # fsGroup: 2000