Merge branch 'master' into fix-latesttag

traefik/Chart.yaml

@@ -2,8 +2,8 @@ apiVersion: v2
 name: traefik
 description: A Traefik based Kubernetes ingress controller
 type: application
-version: 9.14.4
-appVersion: 2.4.5
+version: 9.15.5
+appVersion: 2.4.6
 keywords:
   - traefik
   - ingress

traefik/templates/_podtemplate.tpl

@@ -72,7 +72,7 @@
           {{- toYaml . | nindent 10 }}
         {{- end }}
         volumeMounts:
-          - name: data
+          - name: {{ .Values.persistence.name }}
             mountPath: {{ .Values.persistence.path }}
             {{- if .Values.persistence.subPath }}
             subPath: {{ .Values.persistence.subPath }}
@@ -206,7 +206,7 @@
         {{- toYaml .Values.deployment.additionalContainers | nindent 6 }}
       {{- end }}
       volumes:
-        - name: data
+        - name: {{ .Values.persistence.name }}
           {{- if .Values.persistence.enabled }}
           persistentVolumeClaim:
             claimName: {{ default (include "traefik.fullname" .) .Values.persistence.existingClaim }}

traefik/templates/deployment.yaml

@@ -3,7 +3,7 @@
     {{- with .Values.additionalArguments -}}
       {{- range . -}}
         {{- if contains ".acme." . -}}
-          {{- fail (printf "You can not enabled acme if you set more than one traefik replica") -}}
+          {{- fail (printf "You can not enable acme if you set more than one traefik replica") -}}
         {{- end -}}
       {{- end -}}
     {{- end -}}

traefik/tests/container-config_test.yaml

@@ -6,7 +6,7 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: traefik:2.4.5
+          value: traefik:2.4.6
   - it: should change image when image.tag value is specified
     set:
       image:
@@ -22,7 +22,7 @@ tests:
     asserts:
       - equal:
           path: spec.template.spec.containers[0].image
-          value: traefik/traefik:2.4.5
+          value: traefik/traefik:2.4.6
 
   - it: should have no resource limit by default
     asserts:

traefik/tests/pod-config_test.yaml

@@ -51,6 +51,17 @@ tests:
       - equal:
           path: spec.template.spec.volumes[0].persistentVolumeClaim.claimName
           value: existing-pvc
+      - equal:
+          path: spec.template.spec.volumes[0].name
+          value: data
+  - it: should have pvc with specified name
+    set:
+      persistence:
+        name: my-data
+    asserts:
+      - equal:
+          path: spec.template.spec.volumes[0].name
+          value: my-data
   - it: should have initContainer with specified value
     set:
       deployment:

traefik/values.yaml

@@ -327,6 +327,7 @@ autoscaling:
 # It will persist TLS certificates.
 persistence:
   enabled: false
+  name: data
 #  existingClaim: ""
   accessMode: ReadWriteOnce
   size: 128Mi