varnishncsa waits until varnishd is ready (#42)

* varnishncsa waits until varnishd is ready Signed-off-by: Basilio Vera <[email protected]> * fix "off" default value Signed-off-by: Basilio Vera <[email protected]> --------- Signed-off-by: Basilio Vera <[email protected]>
softonic · Oct 3, 2023 · 24df7d7 · 24df7d7
1 parent ff4cd80
commit 24df7d7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git 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.5
+version: 0.18.6
 appVersion: 7.2.1
diff --git a/templates/deployment.yaml b/templates/deployment.yaml
@@ -108,10 +108,15 @@ spec:
             {{- toYaml .Values.logging.securityContext | nindent 12 }}
           command:
           - varnishncsa
+          {{- if .Values.logging.customOutputJsonFormat }}
+          - -j
+          {{- end }}
           {{- if .Values.logging.customOutput }}
           - -F
           - {{ .Values.logging.customOutput | quote }}
           {{- end }}
+          - -t
+          - {{ .Values.logging.timeout | quote }}
           resources:
             {{- toYaml .Values.logging.resources | nindent 12 }}
           volumeMounts:

diff --git a/values.yaml b/values.yaml
@@ -139,6 +139,13 @@ initContainers: []
 logging:
   enabled: true
   customOutput: null
+  customOutputJsonFormat: false
+  # Timeout before returning error on initial VSM connection.
+  # If set the VSM connection is retried every 0.5 seconds for this many seconds.
+  # If zero the connection is attempted only once and will fail immediately if unsuccessful.
+  # If set to "off", the connection will not fail, allowing the utility to start and wait indefinetely for the Varnish instance to appear.
+  # Defaults to "off" in this case.
+  timeout: "off"
   resources: {}
   securityContext: {}
     # capabilities: