Merge pull request 'chore(deps): update dependency postfixadmin to v3.3.13' (#21) from renovate/postfixadmin-3.x into master

Reviewed-on: #21

.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.11.0
   resources:
     limits:
       cpu: 50
@@ -20,27 +20,38 @@ steps:
 - name: markdown lint
   commands:
   - markdownlint *.md
-  image: docker.io/volkerraschek/markdownlint:0.29.0
+  image: docker.io/volkerraschek/markdownlint:0.33.0
   resources:
     limits:
-      cpu: 50
+      cpu: 150
-      memory: 50M
+      memory: 150M
+
+- name: helm template
+  commands:
+  - helm template .
+  image: docker.io/volkerraschek/helm:3.11.0
+  resources:
+    limits:
+      cpu: 150
+      memory: 150M
 
 - name: email-notification
   environment:
-    PLUGIN_HOST:
+    SMTP_FROM_ADDRESS:
+      from_secret: smtp_from_address
+    SMTP_FROM_NAME:
+      from_secret: smtp_from_name
+    SMTP_HOST:
       from_secret: smtp_host
-    PLUGIN_USERNAME:
+    SMTP_USERNAME:
       from_secret: smtp_username
-    PLUGIN_PASSWORD:
+    SMTP_PASSWORD:
       from_secret: smtp_password
-    PLUGIN_FROM:
+  image: docker.io/volkerraschek/drone-email:0.1.1
-      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
@@ -54,50 +65,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/postfixadmin-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.11.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/postfixadmin-charts

Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: postfixadmin
 description: Helm chart for postfixadmin
 type: application
-version: "0.1.0"
+version: "0.1.1"
-appVersion: "3.3.10"
+appVersion: "3.3.13"
 icon: https://a.fsdn.com/allura/p/postfixadmin/icon?1620415130
 
 keywords:

renovate.json

@@ -3,6 +3,23 @@
   "automergeStrategy": "merge-commit",
   "automergeType": "pr",
   "assignees": [ "volker.raschek" ],
+  "labels": [ "renovate" ],
+  "packageRules": [
+    {
+      "addLabels": [ "renovate/postfixadmin", "renovate/automerge" ],
+      "automerge": true,
+      "matchManagers": "droneci",
+      "matchUpdateTypes": [ "minor", "patch"]
+    },
+    {
+      "addLabels": [ "renovate/postfixadmin", "renovate/automerge" ],
+      "automerge": false,
+      "matchPackageNames": [ "postfixadmin" ],
+      "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/volkerraschek/postfixadmin",
+      "datasourceTemplate": "docker",
-      "datasourceTemplate": "docker"
+      "depNameTemplate": "postfixadmin",
+      "lookupNameTemplate": "docker.io/volkerraschek/postfixadmin"
     }
   ]
-}
+}

templates/postfixadmin/deployment.yaml

@@ -38,11 +38,11 @@ spec:
               protocol: TCP
           livenessProbe:
             httpGet:
-              path: /
+              path: /login.php
               port: http
           readinessProbe:
             httpGet:
-              path: /
+              path: /login.php
               port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
@@ -50,6 +50,9 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- if .Values.podPriorityClassName }}
+      priorityClassName: {{ .Values.podPriorityClassName }}
+      {{- end }}
       {{- with .Values.affinity }}
       affinity:
         {{- toYaml . | nindent 8 }}

values.yaml

@@ -14,6 +14,8 @@ fullnameOverride: ""
 
 podAnnotations: {}
 
+podPriorityClassName: ""
+
 podSecurityContext: {}
   # fsGroup: 2000
 
@@ -25,7 +27,7 @@ securityContext: {}
   # runAsNonRoot: true
   # runAsUser: 1000
 
-config:
+config: {}
   # POSTFIXADMIN_ADMIN_EMAIL
   # Define the email address of an admin via POSTFIXADMIN_ADMIN_EMAIL to send
   # emails or broadcast messages in his name instead of the email address of the