pull/8095/head
Sharif Elgamal 2020-05-15 15:33:03 -07:00
parent 942821bf48
commit 4cbeb18079
2 changed files with 2 additions and 1 deletions

View File

@ -85,6 +85,7 @@ func PreloadExists(k8sVersion, containerRuntime string, forcePreload ...bool) bo
return false return false
} }
// TODO (#8166): Get rid of the need for this and viper at all
force := false force := false
if len(forcePreload) > 0 { if len(forcePreload) > 0 {
force = forcePreload[0] force = forcePreload[0]

View File

@ -328,7 +328,7 @@ func validateStatusCmd(ctx context.Context, t *testing.T, profile string) {
// Custom format // Custom format
rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-f", "host:{{.Host}},kublet:{{.Kubelet}},apiserver:{{.APIServer}},kubeconfig:{{.Kubeconfig}}")) rr, err = Run(t, exec.CommandContext(ctx, Target(), "-p", profile, "status", "-f", "host:{{.Host}},kublet:{{.Kubelet}},apiserver:{{.APIServer}},kubeconfig:{{.Kubeconfig}}"))
if err != nil { if err != nil {
t.Errorf("failed to run minikube status with custom format: args %q: %v", rr.Command(te), err) t.Errorf("failed to run minikube status with custom format: args %q: %v", rr.Command(), err)
} }
re := `host:([A-z]+),kublet:([A-z]+),apiserver:([A-z]+),kubeconfig:([A-z]+)` re := `host:([A-z]+),kublet:([A-z]+),apiserver:([A-z]+),kubeconfig:([A-z]+)`
match, _ := regexp.MatchString(re, rr.Stdout.String()) match, _ := regexp.MatchString(re, rr.Stdout.String())