Tweaks for bleeding edge istio

Signed-off-by: Otto van der Schaaf <[email protected]>
istio · oschaaf · Apr 15, 2020 · Apr 16, 2020 · Apr 16, 2020 · Apr 16, 2020
commit bce6a4f97bc98ced31ff89e482d8b338feb57d8b
@@ -56,7 +56,7 @@ file system as well as priviliges to install new packages for the sidecar contai
 command (re)configures istio to satisfy these requirements:
 
 ```bash
-istioctl manifest apply --set "values.global.proxy.privileged=true,values.global.proxy.enableCoreDump=true"
+istioctl manifest apply --set "values.global.proxy.enableCoreDump=true" --set "values.global.proxy.privileged=true"
 ```
 
 After doing so `runner.py` can be run with `--envoy_profiler [heapprofiler|cpuprofiler]`. This will start/stop

@@ -284,7 +284,7 @@ def run_envoy_profiler(self, exec_cmd, podname, profile_name, envoy_profiler, la
             script = script + " go get -u github.com/google/pprof"
             print(getoutput("{exec_cmd} \"{script}\"".format(exec_cmd=exec_cmd_on_pod, script=script)))
 
-        script = "rm -r /tmp/envoy; cp -r /var/log/envoy/ /tmp/envoy; cp -r /lib/x86_64-linux-gnu /tmp/envoy/lib; cp /usr/local/bin/envoy /tmp/envoy/lib/envoy"
+        script = "rm -r /tmp/envoy; cp -r /var/lib/istio/data/ /tmp/envoy; cp -r /lib/x86_64-linux-gnu /tmp/envoy/lib; cp /usr/local/bin/envoy /tmp/envoy/lib/envoy"
         print(getoutput("{exec_cmd} \"{script}\"".format(exec_cmd=exec_cmd_on_pod, script=script)))
         output_name = "tmp.svg"
 
@@ -343,7 +343,7 @@ def maybe_start_profiling_threads(self, labels, perf_label):
                     namespace=os.environ.get("NAMESPACE", "twopods"),
                     podname=pod
                 )
-                script = "set -euo pipefail; sudo rm -rf {dir} || true; sudo mkdir -p {dir}; sudo chmod 777 {dir};".format(dir="/var/log/envoy")
+                script = "set -euo pipefail; sudo rm -rf {dir}/* || true; sudo mkdir -p {dir}; sudo chmod 777 {dir};".format(dir="/var/lib/istio/data/")
                 print(getoutput("{exec_cmd} \"{script}\"".format(exec_cmd=exec_cmd_on_pod, script=script)))
                 threads.append(Thread(target=self.run_envoy_profiler, args=[
                     exec_cmd_on_pod, pod, "envoy-" + self.envoy_profiler, self.envoy_profiler, labels + perf_label]))