From f8e206e80230b072235abcf43fcc2519b7644491 Mon Sep 17 00:00:00 2001 From: Jordan Liggitt Date: Fri, 13 Oct 2017 12:49:21 -0400 Subject: [PATCH] Remove /ui/ redirect --- cmd/kube-apiserver/app/server.go | 1 - hack/make-rules/test-cmd-util.sh | 7 ++-- pkg/master/master.go | 7 ---- pkg/routes/BUILD | 6 +--- pkg/routes/ui.go | 36 -------------------- test/e2e/ui/dashboard.go | 11 ------ test/integration/openshift/openshift_test.go | 1 - 7 files changed, 4 insertions(+), 65 deletions(-) delete mode 100644 pkg/routes/ui.go diff --git a/cmd/kube-apiserver/app/server.go b/cmd/kube-apiserver/app/server.go index 5a3a46afd54..8284f586935 100644 --- a/cmd/kube-apiserver/app/server.go +++ b/cmd/kube-apiserver/app/server.go @@ -336,7 +336,6 @@ func CreateKubeAPIServerConfig(s *options.ServerRunOptions, nodeTunneler tunnele EnableCoreControllers: true, EventTTL: s.EventTTL, KubeletClientConfig: s.KubeletConfig, - EnableUISupport: true, EnableLogsSupport: s.EnableLogsHandler, ProxyTransport: proxyTransport, diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh index a24cf66a514..a4a9ed5c447 100755 --- a/hack/make-rules/test-cmd-util.sh +++ b/hack/make-rules/test-cmd-util.sh @@ -3503,10 +3503,8 @@ run_kubectl_local_proxy_tests() { kube::log::status "Testing kubectl local proxy" - # Make sure the UI can be proxied start-proxy - check-curl-proxy-code /ui 307 - check-curl-proxy-code /api/ui 404 + check-curl-proxy-code /api/kubernetes 404 check-curl-proxy-code /api/v1/namespaces 200 if kube::test::if_supports_resource "${metrics}" ; then check-curl-proxy-code /metrics 200 @@ -3524,7 +3522,8 @@ run_kubectl_local_proxy_tests() { # Custom paths let you see everything. start-proxy /custom - check-curl-proxy-code /custom/ui 307 + check-curl-proxy-code /custom/api/kubernetes 404 + check-curl-proxy-code /custom/api/v1/namespaces 200 if kube::test::if_supports_resource "${metrics}" ; then check-curl-proxy-code /custom/metrics 200 fi diff --git a/pkg/master/master.go b/pkg/master/master.go index eb8569d072d..d84dc5fa7ec 100644 --- a/pkg/master/master.go +++ b/pkg/master/master.go @@ -109,7 +109,6 @@ type ExtraConfig struct { // Used to start and monitor tunneling Tunneler tunneler.Tunneler - EnableUISupport bool EnableLogsSupport bool ProxyTransport http.RoundTripper @@ -269,9 +268,6 @@ func (cfg *Config) Complete(informers informers.SharedInformerFactory) Completed glog.Infof("Node port range unspecified. Defaulting to %v.", c.ExtraConfig.ServiceNodePortRange) } - // enable swagger UI only if general UI support is on - c.GenericConfig.EnableSwaggerUI = c.GenericConfig.EnableSwaggerUI && c.ExtraConfig.EnableUISupport - if c.ExtraConfig.EndpointReconcilerConfig.Interval == 0 { c.ExtraConfig.EndpointReconcilerConfig.Interval = DefaultEndpointReconcilerInterval } @@ -304,9 +300,6 @@ func (c completedConfig) New(delegationTarget genericapiserver.DelegationTarget) return nil, err } - if c.ExtraConfig.EnableUISupport { - routes.UIRedirect{}.Install(s.Handler.NonGoRestfulMux) - } if c.ExtraConfig.EnableLogsSupport { routes.Logs{}.Install(s.Handler.GoRestfulContainer) } diff --git a/pkg/routes/BUILD b/pkg/routes/BUILD index b62bff305db..7d7d3690250 100644 --- a/pkg/routes/BUILD +++ b/pkg/routes/BUILD @@ -10,13 +10,9 @@ go_library( srcs = [ "doc.go", "logs.go", - "ui.go", ], importpath = "k8s.io/kubernetes/pkg/routes", - deps = [ - "//vendor/github.com/emicklei/go-restful:go_default_library", - "//vendor/k8s.io/apiserver/pkg/server/mux:go_default_library", - ], + deps = ["//vendor/github.com/emicklei/go-restful:go_default_library"], ) filegroup( diff --git a/pkg/routes/ui.go b/pkg/routes/ui.go deleted file mode 100644 index de6ca3c3abd..00000000000 --- a/pkg/routes/ui.go +++ /dev/null @@ -1,36 +0,0 @@ -/* -Copyright 2014 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 routes - -import ( - "net/http" - - "k8s.io/apiserver/pkg/server/mux" -) - -const dashboardPath = "/api/v1/namespaces/kube-system/services/https:kubernetes-dashboard:/proxy/" - -// UIRedirect redirects /ui to the kube-ui proxy path. -type UIRedirect struct{} - -func (r UIRedirect) Install(c *mux.PathRecorderMux) { - handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - http.Redirect(w, r, dashboardPath, http.StatusTemporaryRedirect) - }) - c.Handle("/ui", handler) - c.HandlePrefix("/ui/", handler) -} diff --git a/test/e2e/ui/dashboard.go b/test/e2e/ui/dashboard.go index 2bc9415f093..7077f7e0148 100644 --- a/test/e2e/ui/dashboard.go +++ b/test/e2e/ui/dashboard.go @@ -86,16 +86,5 @@ var _ = SIGDescribe("Kubernetes Dashboard", func() { return status == http.StatusOK, nil }) Expect(err).NotTo(HaveOccurred()) - - By("Checking that the ApiServer /ui endpoint redirects to a valid server.") - var status int - err = f.ClientSet.CoreV1().RESTClient().Get(). - AbsPath(uiRedirect). - Timeout(framework.SingleCallTimeout). - Do(). - StatusCode(&status). - Error() - Expect(err).NotTo(HaveOccurred()) - Expect(status).To(Equal(http.StatusOK), "Unexpected status from /ui") }) }) diff --git a/test/integration/openshift/openshift_test.go b/test/integration/openshift/openshift_test.go index 40b62455b72..fa42915ae75 100644 --- a/test/integration/openshift/openshift_test.go +++ b/test/integration/openshift/openshift_test.go @@ -32,7 +32,6 @@ func TestMasterExportsSymbols(t *testing.T) { }, ExtraConfig: master.ExtraConfig{ EnableCoreControllers: false, - EnableUISupport: false, EnableLogsSupport: false, }, }