From 578e623e4bb803e5748ff5231d9c0a4200512959 Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <soltesz@google.com>
Date: Mon, 9 Dec 2019 11:43:16 -0500
Subject: [PATCH] Deploy packet-headers unconditionally (#332)

---
 k8s/daemonsets/templates.jsonnet | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/k8s/daemonsets/templates.jsonnet b/k8s/daemonsets/templates.jsonnet
index 666a9487..4625419c 100644
--- a/k8s/daemonsets/templates.jsonnet
+++ b/k8s/daemonsets/templates.jsonnet
@@ -286,13 +286,8 @@ local ExperimentNoIndex(name, datatypes, hostNetwork, bucket) = {
           std.flattenArrays([
             Tcpinfo(name, 9991, hostNetwork),
             Traceroute(name, 9992, hostNetwork),
-            if std.extVar('PROJECT_ID') != 'mlab-oti' then
-              std.flattenArrays([
-                Pcap(name, 9993, hostNetwork),
-                Pusher(name, 9994, ['tcpinfo', 'traceroute', 'pcap'] + datatypes, hostNetwork, bucket),
-              ])
-            else
-              Pusher(name, 9994, ['tcpinfo', 'traceroute'] + datatypes, hostNetwork, bucket)
+            Pcap(name, 9993, hostNetwork),
+            Pusher(name, 9994, ['tcpinfo', 'traceroute', 'pcap'] + datatypes, hostNetwork, bucket),
           ]),
         [if hostNetwork then 'serviceAccountName']: 'kube-rbac-proxy',
         initContainers: [