Add --network-plugin=cni as per afbjorklund's comment

pull/3536/head
Thomas Stromberg 2019-01-18 15:03:05 -08:00
parent d499497056
commit 9e0119b8e2
2 changed files with 3 additions and 1 deletions

View File

@ -46,6 +46,7 @@ func TestStartStop(t *testing.T) {
name: "crio",
runtime: constants.CrioRuntime,
},
// TODO(tstromberg): Add test for crio w/o cni
}
for _, test := range tests {

View File

@ -184,11 +184,12 @@ func (m *MinikubeRunner) SSH(command string) (string, error) {
func (m *MinikubeRunner) Start() {
opts := ""
// TODO(tstromberg): Deprecate this in favor of making it possible for tests to define explicit flags.
switch r := m.Runtime; r {
case constants.ContainerdRuntime:
opts = "--container-runtime=containerd --network-plugin=cni --enable-default-cni --docker-opt containerd=/var/run/containerd/containerd.sock"
case constants.CrioRuntime:
opts = "--container-runtime=crio"
opts = "--container-runtime=crio --network-plugin=cni"
}
m.RunCommand(fmt.Sprintf("start %s %s %s --alsologtostderr --v=5", m.StartArgs, m.Args, opts), true)