diff --git a/test/framework/universal_app.go b/test/framework/universal_app.go index bb242490ddbf..2cc3ff40875f 100644 --- a/test/framework/universal_app.go +++ b/test/framework/universal_app.go @@ -444,44 +444,43 @@ func (s *UniversalApp) CreateDP( // run the DP as user `envoy` so iptables can distinguish its traffic if needed args := []string{ "runuser", "-u", "kuma-dp", "--", - "/bin/bash", "-c", + "/usr/bin/kuma-dp", "run", + "--cp-address=" + cpAddress, + "--dataplane-token-file=/kuma/token-" + name, + "--binary-path", "/usr/local/bin/envoy", } - dpRun := "'/usr/bin/kuma-dp run " + - "--cp-address=" + cpAddress + " " + - "--dataplane-token-file=/kuma/token-" + name + " " + - "--binary-path /usr/local/bin/envoy " - if dpyaml != "" { err = ssh.NewApp(s.containerName, "", s.verbose, s.ports[sshPort], nil, []string{"printf ", "\"" + dpyaml + "\"", ">", "/kuma/dpyaml-" + name}).Run() if err != nil { panic(err) } - dpRun += " --dataplane-file=/kuma/dpyaml-" + name + " --dataplane-var name=" + name + " --dataplane-var address=" + ip + args = append(args, + "--dataplane-file=/kuma/dpyaml-"+name, + "--dataplane-var", "name="+name, + "--dataplane-var", "address="+ip) } else { - dpRun += " --name=" + name + " --mesh=" + mesh + args = append(args, + "--name="+name, + "--mesh="+mesh) } if concurrency > 0 { - dpRun += " --concurrency " + strconv.Itoa(concurrency) + args = append(args, "--concurrency", strconv.Itoa(concurrency)) } if builtindns { - dpRun += " --dns-enabled " + args = append(args, "--dns-enabled") } if proxyType != "" { - dpRun += " --proxy-type " + proxyType + args = append(args, "--proxy-type", proxyType) } if Config.Debug { - dpRun += "--log-level debug " + args = append(args, "--log-level", "debug") } - // we put the logs in the init process, so they are also available in 'docker logs...' command - dpRun += "' >> /proc/1/fd/1" - args = append(args, dpRun) - s.dpApp = ssh.NewApp(s.containerName, s.logsPath, s.verbose, s.ports[sshPort], envsMap, args) }