From 64b163dc3b07560466b6283238011b2be7963183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frantis=CC=8Cek=20Ha=CC=81na?= <sinacek@gmail.com>
Date: Wed, 10 Apr 2024 13:24:02 +0200
Subject: [PATCH 1/3] fix exporter port

---
 templates/deployment.yaml | 4 ++--
 templates/service.yaml    | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/templates/deployment.yaml b/templates/deployment.yaml
index e47e378..4329dd1 100644
--- a/templates/deployment.yaml
+++ b/templates/deployment.yaml
@@ -130,7 +130,7 @@ spec:
           securityContext:
             {{- toYaml .Values.prometheus.securityContext | nindent 12 }}
           ports:
-          - name: http
+          - name: exporter
             containerPort: {{ .Values.prometheus.port }}
             protocol: TCP
           resources:
@@ -162,7 +162,7 @@ spec:
     {{- end }}
     {{- if or .Values.logging.enabled .Values.vcl .Values.vclConfigmap .Values.extraVolumes }}
       volumes:
-      {{- if .Values.logging.enabled }}
+      {{- if or .Values.logging.enabled .Values.prometheus.enabled }}
       - name: vsm
         emptyDir:
           medium: Memory
diff --git a/templates/service.yaml b/templates/service.yaml
index d6454e3..19f775e 100644
--- a/templates/service.yaml
+++ b/templates/service.yaml
@@ -18,9 +18,11 @@ spec:
       targetPort: http
       protocol: TCP
       name: http
+      {{- if .Values.prometheus.enabled }}
     - port: {{ .Values.prometheus.port }}
-      targetPort: http
+      targetPort: exporter
       protocol: TCP
       name: exporter
+      {{- end }}
   selector:
     {{- include "varnish.selectorLabels" . | nindent 4 }}

From 2f35ea679f2d3eb00df859bcb391ebb97cb22a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frantis=CC=8Cek=20Ha=CC=81na?= <sinacek@gmail.com>
Date: Wed, 10 Apr 2024 13:25:21 +0200
Subject: [PATCH 2/3] bump varnish version

---
 Chart.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Chart.yaml b/Chart.yaml
index e5525c0..1c65395 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: varnish
 description: A Varnish Cache Helm chart for Kubernetes
 type: application
-version: 0.18.9
-appVersion: 7.2.1
+version: 0.19.0
+appVersion: 7.5.0

From 4d94b8030be1cad63bd9aca648544c637bac1807 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frantis=CC=8Cek=20Ha=CC=81na?= <sinacek@gmail.com>
Date: Wed, 10 Apr 2024 13:26:01 +0200
Subject: [PATCH 3/3] add missing configuration option to default values.yaml

---
 values.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/values.yaml b/values.yaml
index d2609b0..bc952cc 100644
--- a/values.yaml
+++ b/values.yaml
@@ -125,6 +125,9 @@ vcl: {}
   #     that
   #   }
 
+vclFiles: {}
+  # defaultByFile.vcl: "vcl/default.vcl"
+
 # set this to a configmap name if we want to provide our own instead of declaring text
 # it should have filenames as keys (as default.vcl)