Fix up changed changed .Run signature in felix

projectcalico · Jul 12, 2018 · c5a7c16 · c5a7c16
1 parent c1f22e0
commit c5a7c16
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/tests/testutils/policy_controller_utils.go b/tests/testutils/policy_controller_utils.go
@@ -26,6 +26,7 @@ import (
 
 func RunPolicyController(etcdIP, kconfigfile string) *containers.Container {
 	return containers.Run("calico-policy-controller",
+		containers.RunOpts{AutoRemove: true},
 		"--privileged",
 		"-e", fmt.Sprintf("ETCD_ENDPOINTS=http://%s:2379", etcdIP),
 		"-e", "ENABLED_CONTROLLERS=workloadendpoint,namespace,policy,node,serviceaccount",

diff --git a/tests/testutils/utils.go b/tests/testutils/utils.go
@@ -53,6 +53,7 @@ current-context: test-context`
 
 func RunK8sApiserver(etcdIp string) *containers.Container {
 	return containers.Run("st-apiserver",
+		containers.RunOpts{AutoRemove: true},
 		"-v", os.Getenv("PRIVATE_KEY")+":/private.key",
 		fmt.Sprintf("%s", os.Getenv("HYPERKUBE_IMAGE")),
 		"/hyperkube", "apiserver",
@@ -67,6 +68,7 @@ func RunK8sApiserver(etcdIp string) *containers.Container {
 
 func RunK8sControllerManager(apiserverIp string) *containers.Container {
 	c := containers.Run("st-controller-manager",
+		containers.RunOpts{AutoRemove: true},
 		"-v", os.Getenv("PRIVATE_KEY")+":/private.key",
 		fmt.Sprintf("%s", os.Getenv("HYPERKUBE_IMAGE")),
 		"/hyperkube", "controller-manager",
@@ -82,6 +84,7 @@ func RunK8sControllerManager(apiserverIp string) *containers.Container {
 
 func RunEtcd() *containers.Container {
 	return containers.Run("etcd-fv",
+		containers.RunOpts{AutoRemove: true},
 		fmt.Sprintf("%s", os.Getenv("ETCD_IMAGE")),
 		"etcd",
 		"--advertise-client-urls", "http://127.0.0.1:2379",