kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

update gvisor addon test now that addons are per profile

pull/6124/head
Priya Wadhwa 2019-12-30 16:31:59 -05:00
parent 1126f26197
commit 44cde7767f
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/integration/gvisor_addon_test.go
View File

@ -49,7 +49,7 @@ func TestGvisorAddon(t *testing.T) {
CleanupWithLogs(t, profile, cancel) CleanupWithLogs(t, profile, cancel)
}() }()
startArgs := append([]string{"start", "-p", profile, "--container-runtime=containerd", "--docker-opt", "containerd=/var/run/containerd/containerd.sock", "--wait=false"}, StartArgs()...) startArgs := append([]string{"start", "-p", profile, "--container-runtime=containerd", "--docker-opt", "containerd=/var/run/containerd/containerd.sock"}, StartArgs()...)
rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...)) rr, err := Run(t, exec.CommandContext(ctx, Target(), startArgs...))
if err != nil { if err != nil {
t.Fatalf("%s failed: %v", rr.Args, err) t.Fatalf("%s failed: %v", rr.Args, err)
@ -61,20 +61,11 @@ func TestGvisorAddon(t *testing.T) {
t.Logf("%s failed: %v (won't test local image)", rr.Args, err) t.Logf("%s failed: %v (won't test local image)", rr.Args, err)
} }
// NOTE: addons are global, but the addon must assert that the runtime is containerd
rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "enable", "gvisor")) rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "addons", "enable", "gvisor"))
if err != nil { if err != nil {
t.Fatalf("%s failed: %v", rr.Args, err) t.Fatalf("%s failed: %v", rr.Args, err)
} }
// Because addons are persistent across profiles :(
defer func() {
rr, err := Run(t, exec.Command(Target(), "-p", profile, "addons", "disable", "gvisor"))
if err != nil {
t.Logf("%s failed: %v", rr.Args, err)
}
}()
if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", 4*time.Minute); err != nil { if _, err := PodWait(ctx, t, profile, "kube-system", "kubernetes.io/minikube-addons=gvisor", 4*time.Minute); err != nil {
t.Fatalf("waiting for gvisor controller to be up: %v", err) t.Fatalf("waiting for gvisor controller to be up: %v", err)
} }