Fix various examples for kubectl-type deployments (non-helm).

We must now pass in the Pod namespace and name via the downward API, because the varnishd start script requires it.

Fix various examples for kubectl-type deployments (non-helm).
We must now pass in the Pod namespace and name via the downward API, because the varnishd start script requires it.
803148b9 · Geoff Simmons · 06b3fabb · 803148b9 · 803148b9 · 803148b9
Commit 803148b9 authored Apr 29, 2021 by Geoff Simmons
13 changed files
--- a/examples/architectures/cluster-and-ns-wide/varnish-coffee.yaml
+++ b/examples/architectures/cluster-and-ns-wide/varnish-coffee.yaml
@@ -33,6 +33,15 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/architectures/cluster-and-ns-wide/varnish-system.yaml
+++ b/examples/architectures/cluster-and-ns-wide/varnish-system.yaml
@@ -33,6 +33,15 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/architectures/clusterwide/varnish.yaml
+++ b/examples/architectures/clusterwide/varnish.yaml
@@ -33,6 +33,15 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/architectures/multi-controller/varnish-coffee.yaml
+++ b/examples/architectures/multi-controller/varnish-coffee.yaml
@@ -35,6 +35,15 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/architectures/multi-controller/varnish-tea.yaml
+++ b/examples/architectures/multi-controller/varnish-tea.yaml
@@ -35,6 +35,15 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/architectures/multi-varnish-ns/varnish-coffee.yaml
+++ b/examples/architectures/multi-varnish-ns/varnish-coffee.yaml
@@ -35,6 +35,15 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/architectures/multi-varnish-ns/varnish-tea.yaml
+++ b/examples/architectures/multi-varnish-ns/varnish-tea.yaml
@@ -35,6 +35,15 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/file-cache/varnish.yaml
+++ b/examples/file-cache/varnish.yaml
@@ -102,6 +102,15 @@ spec:
          mountPath: "/var/run/offload"
        - name: persistent-storage
          mountPath: "/run/varnish-home/persistent-storage"
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/namespace/varnish.yaml
+++ b/examples/namespace/varnish.yaml
@@ -33,6 +33,15 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/varnish_pod_template/cli-args.yaml
+++ b/examples/varnish_pod_template/cli-args.yaml
@@ -89,6 +89,15 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
+          - name: POD_NAMESPACE
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.namespace
+          - name: POD_NAME
+            valueFrom:
+              fieldRef:
+                fieldPath: metadata.name
        livenessProbe:
          exec:
            command:

--- a/examples/varnish_pod_template/env.yaml
+++ b/examples/varnish_pod_template/env.yaml
@@ -104,6 +104,15 @@ spec:
          - -n
          - /var/run/varnish-home
        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+
        # Use the PROXY protocol (cf. proxy.yaml).
        - name: PROTO
          value: PROXY

--- a/examples/varnish_pod_template/nonroot.yaml
+++ b/examples/varnish_pod_template/nonroot.yaml
@@ -110,6 +110,15 @@ spec:
        # the http targetPort in the Service.
        - name: HTTP_PORT
          value: "8888"
+
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
      - image: varnish-ingress/haproxy
        imagePullPolicy: IfNotPresent
        name: varnish-ingress-offloader

--- a/examples/varnish_pod_template/proxy.yaml
+++ b/examples/varnish_pod_template/proxy.yaml
@@ -89,6 +89,7 @@ spec:
          mountPath: "/var/run/varnish-home"
        - name: offload
          mountPath: "/var/run/offload"
+        env:
        livenessProbe:
          exec:
            command:
@@ -109,6 +110,15 @@ spec:
        # see: https://www.haproxy.org/download/1.8/doc/proxy-protocol.txt
        - name: PROTO
          value: PROXY
+
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.namespace
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
      - image: varnish-ingress/haproxy
        imagePullPolicy: IfNotPresent
        name: varnish-ingress-offloader