提交 a2218d2e 编写于 作者: D dlorenc 提交者: dlorenc

Add two more kubeadm preflight ignores to make e2e tests pass.

上级 c9a7e907
......@@ -160,7 +160,8 @@ var Preflights = []string{
// We use --ignore-preflight-errors=DirAvailable since we have our own custom addons
// that we also stick in /etc/kubernetes/manifests
"DirAvailable--etc-kubernetes-manifests",
"DirAvailable--data",
"DirAvailable--data-minikube",
"Port-10250",
"FileAvailable--etc-kubernetes-manifests-kube-scheduler.yaml",
"FileAvailable--etc-kubernetes-manifests-kube-apiserver.yaml",
"FileAvailable--etc-kubernetes-manifests-kube-controller-manager.yaml",
......
......@@ -48,15 +48,21 @@ func testDashboard(t *testing.T) {
t.Parallel()
minikubeRunner := NewMinikubeRunner(t)
if err := util.WaitForDashboardRunning(t); err != nil {
t.Fatalf("waiting for dashboard to be up: %s", err)
var u url.URL
checkDashboard := func(t *testing.T) error {
dashboardURL = minikubeRunner.RunCommand("dashboard --url", false)
u, err := url.Parse(strings.TrimSpace(dashboardURL))
if err != nil {
return err
}
return nil
}
dashboardURL := minikubeRunner.RunCommand("dashboard --url", true)
u, err := url.Parse(strings.TrimSpace(dashboardURL))
if err != nil {
t.Fatalf("failed to parse dashboard URL %s: %v", dashboardURL, err)
if err := util.Retry(t, checkDashboard, 2*time.Second, 10); err != nil {
t.Fatalf("error checking dashboard URL: %s", err)
}
if u.Scheme != "http" {
t.Fatalf("wrong scheme in dashboard URL, expected http, actual %s", u.Scheme)
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册