From f9954d02c491a804066560c0cf0ba9cabdd23ad1 Mon Sep 17 00:00:00 2001 From: Shu Muto Date: Thu, 10 Feb 2022 14:25:18 +0900 Subject: [PATCH] Delete test/e2e/ui/ --- test/e2e/e2e_test.go | 1 - test/e2e/ui/dashboard.go | 95 ---------------------------------------- test/e2e/ui/framework.go | 24 ---------- 3 files changed, 120 deletions(-) delete mode 100644 test/e2e/ui/dashboard.go delete mode 100644 test/e2e/ui/framework.go diff --git a/test/e2e/e2e_test.go b/test/e2e/e2e_test.go index 1c2227881ef..2bd2af0a781 100644 --- a/test/e2e/e2e_test.go +++ b/test/e2e/e2e_test.go @@ -58,7 +58,6 @@ import ( _ "k8s.io/kubernetes/test/e2e/scheduling" _ "k8s.io/kubernetes/test/e2e/storage" _ "k8s.io/kubernetes/test/e2e/storage/external" - _ "k8s.io/kubernetes/test/e2e/ui" _ "k8s.io/kubernetes/test/e2e/windows" ) diff --git a/test/e2e/ui/dashboard.go b/test/e2e/ui/dashboard.go deleted file mode 100644 index f4a79b4f9a3..00000000000 --- a/test/e2e/ui/dashboard.go +++ /dev/null @@ -1,95 +0,0 @@ -/* -Copyright 2015 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package ui - -import ( - "context" - "net/http" - "time" - - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/apimachinery/pkg/labels" - utilnet "k8s.io/apimachinery/pkg/util/net" - "k8s.io/apimachinery/pkg/util/wait" - "k8s.io/kubernetes/test/e2e/framework" - e2enetwork "k8s.io/kubernetes/test/e2e/framework/network" - e2eservice "k8s.io/kubernetes/test/e2e/framework/service" - e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" - testutils "k8s.io/kubernetes/test/utils" - - "github.com/onsi/ginkgo" -) - -var _ = SIGDescribe("Kubernetes Dashboard [Feature:Dashboard]", func() { - ginkgo.BeforeEach(func() { - // TODO(kubernetes/kubernetes#61559): Enable dashboard here rather than skip the test. - e2eskipper.SkipIfProviderIs("gke") - }) - - const ( - uiServiceName = "kubernetes-dashboard" - uiAppName = uiServiceName - uiNamespace = metav1.NamespaceSystem - - serverStartTimeout = 1 * time.Minute - ) - - f := framework.NewDefaultFramework(uiServiceName) - - ginkgo.It("should check that the kubernetes-dashboard instance is alive", func() { - ginkgo.By("Checking whether the kubernetes-dashboard service exists.") - err := e2enetwork.WaitForService(f.ClientSet, uiNamespace, uiServiceName, true, framework.Poll, framework.ServiceStartTimeout) - framework.ExpectNoError(err) - - ginkgo.By("Checking to make sure the kubernetes-dashboard pods are running") - selector := labels.SelectorFromSet(labels.Set(map[string]string{"k8s-app": uiAppName})) - err = testutils.WaitForPodsWithLabelRunning(f.ClientSet, uiNamespace, selector) - framework.ExpectNoError(err) - - ginkgo.By("Checking to make sure we get a response from the kubernetes-dashboard.") - err = wait.Poll(framework.Poll, serverStartTimeout, func() (bool, error) { - var status int - proxyRequest, errProxy := e2eservice.GetServicesProxyRequest(f.ClientSet, f.ClientSet.CoreV1().RESTClient().Get()) - if errProxy != nil { - framework.Logf("Get services proxy request failed: %v", errProxy) - } - - ctx, cancel := context.WithTimeout(context.Background(), framework.SingleCallTimeout) - defer cancel() - - // Query against the proxy URL for the kubernetes-dashboard service. - err := proxyRequest.Namespace(uiNamespace). - Name(utilnet.JoinSchemeNamePort("https", uiServiceName, "")). - Timeout(framework.SingleCallTimeout). - Do(ctx). - StatusCode(&status). - Error() - if err != nil { - if ctx.Err() != nil { - framework.Failf("Request to kubernetes-dashboard failed: %v", err) - return true, err - } - framework.Logf("Request to kubernetes-dashboard failed: %v", err) - } else if status != http.StatusOK { - framework.Logf("Unexpected status from kubernetes-dashboard: %v", status) - } - // Don't return err here as it aborts polling. - return status == http.StatusOK, nil - }) - framework.ExpectNoError(err) - }) -}) diff --git a/test/e2e/ui/framework.go b/test/e2e/ui/framework.go deleted file mode 100644 index 930802fdcbb..00000000000 --- a/test/e2e/ui/framework.go +++ /dev/null @@ -1,24 +0,0 @@ -/* -Copyright 2017 The Kubernetes Authors. - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. -*/ - -package ui - -import "github.com/onsi/ginkgo" - -// SIGDescribe annotates the test with the SIG label. -func SIGDescribe(text string, body func()) bool { - return ginkgo.Describe("[sig-ui] "+text, body) -}