Fix the TemplateConfig test for kubectl-type deployments.

test/e2e/tmplcfg/tmplcfg.yaml

@@ -474,17 +474,17 @@ spec:
             vk8s_cluster.reconfigure();
             {{- digest_init . }}
             {{ if .PrimaryOnly -}}
-	    new vk8s_cluster_primary = taskvar.backend();
-	    {{- end }}
+            new vk8s_cluster_primary = taskvar.backend();
+            {{- end }}
     }
 
     sub vcl_recv {
             {{ if .PrimaryOnly -}}
             {{- digest_update 'c' . }}
-	    vk8s_cluster_primary.set(vk8s_cluster.backend(resolve=NOW
-		{{- key 'c' .}}));
+            vk8s_cluster_primary.set(vk8s_cluster.backend(resolve=NOW
+                {{- key 'c' .}}));
             if (remote.ip !~ vk8s_cluster_acl
-	        && "" + vk8s_cluster_primary.get() != server.identity) {
+                && "" + vk8s_cluster_primary.get() != server.identity) {
                     set req.backend_hint = vk8s_cluster_primary.get();
                     return (pipe);
             }
@@ -546,10 +546,9 @@ spec:
     }
 
     sub vcl_deliver {
-            set resp.http.Shard-Template = "override";
             if (remote.ip ~ vk8s_cluster_acl
-		{{- if .PrimaryOnly }} && ! vk8s_cluster_primary.defined()
-		{{- end }}) {
+                {{- if .PrimaryOnly }} && ! vk8s_cluster_primary.defined()
+                {{- end }}) {
                     if (! obj.uncacheable) {
                             set resp.http.VK8S-Cluster-TTL = obj.ttl;
                     }

test/e2e/tmplcfg/varnish.yaml

@@ -45,6 +45,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: