Deploy packet-headers unconditionally (#332)

m-lab · Dec 9, 2019 · 578e623 · 578e623
1 parent 854da01
commit 578e623
Showing 1 changed file with 2 additions and 7 deletions.
diff --git 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: [