Skip to content

Commit c5a7c16

Browse files
committed
Fix up changed changed .Run signature in felix
1 parent c1f22e0 commit c5a7c16

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

tests/testutils/policy_controller_utils.go

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626

2727
func RunPolicyController(etcdIP, kconfigfile string) *containers.Container {
2828
return containers.Run("calico-policy-controller",
29+
containers.RunOpts{AutoRemove: true},
2930
"--privileged",
3031
"-e", fmt.Sprintf("ETCD_ENDPOINTS=http://%s:2379", etcdIP),
3132
"-e", "ENABLED_CONTROLLERS=workloadendpoint,namespace,policy,node,serviceaccount",

tests/testutils/utils.go

+3
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ current-context: test-context`
5353

5454
func RunK8sApiserver(etcdIp string) *containers.Container {
5555
return containers.Run("st-apiserver",
56+
containers.RunOpts{AutoRemove: true},
5657
"-v", os.Getenv("PRIVATE_KEY")+":/private.key",
5758
fmt.Sprintf("%s", os.Getenv("HYPERKUBE_IMAGE")),
5859
"/hyperkube", "apiserver",
@@ -67,6 +68,7 @@ func RunK8sApiserver(etcdIp string) *containers.Container {
6768

6869
func RunK8sControllerManager(apiserverIp string) *containers.Container {
6970
c := containers.Run("st-controller-manager",
71+
containers.RunOpts{AutoRemove: true},
7072
"-v", os.Getenv("PRIVATE_KEY")+":/private.key",
7173
fmt.Sprintf("%s", os.Getenv("HYPERKUBE_IMAGE")),
7274
"/hyperkube", "controller-manager",
@@ -82,6 +84,7 @@ func RunK8sControllerManager(apiserverIp string) *containers.Container {
8284

8385
func RunEtcd() *containers.Container {
8486
return containers.Run("etcd-fv",
87+
containers.RunOpts{AutoRemove: true},
8588
fmt.Sprintf("%s", os.Getenv("ETCD_IMAGE")),
8689
"etcd",
8790
"--advertise-client-urls", "http://127.0.0.1:2379",

0 commit comments

Comments
 (0)