From e42d9517b7b2f25cd10189c1e95898bb0478fd5c Mon Sep 17 00:00:00 2001 From: zhu733756 Date: Mon, 17 Jan 2022 16:18:17 +0800 Subject: [PATCH] make generic proxy can be marked as deprecated Signed-off-by: zhu733756 --- pkg/kapis/generic/generic.go | 11 +++++++++++ pkg/kapis/kubeedge/v1alpha1/register.go | 2 ++ 2 files changed, 13 insertions(+) diff --git a/pkg/kapis/generic/generic.go b/pkg/kapis/generic/generic.go index 41a67e472..aad7482a6 100644 --- a/pkg/kapis/generic/generic.go +++ b/pkg/kapis/generic/generic.go @@ -41,6 +41,9 @@ type genericProxy struct { // api version Version string + + // mark as desprecated + desprecated bool } func NewGenericProxy(endpoint string, groupName string, version string) (*genericProxy, error) { @@ -59,6 +62,10 @@ func NewGenericProxy(endpoint string, groupName string, version string) (*generi }, nil } +func (g *genericProxy) SetProxyDesprecated() { + g.desprecated = true +} + // currently, we only support proxy GET/PUT/POST/DELETE/PATCH. // Maybe we can try another way to implement proxy. func (g *genericProxy) AddToContainer(container *restful.Container) error { @@ -93,6 +100,10 @@ func (g *genericProxy) AddToContainer(container *restful.Container) error { } func (g *genericProxy) handler(request *restful.Request, response *restful.Response) { + if g.desprecated { + klog.Warning(fmt.Sprintf("This proxy group %s has deprecated", g.GroupName)) + } + u := g.makeURL(request) httpProxy := proxy.NewUpgradeAwareHandler(u, http.DefaultTransport, false, false, &errorResponder{}) diff --git a/pkg/kapis/kubeedge/v1alpha1/register.go b/pkg/kapis/kubeedge/v1alpha1/register.go index 58f536fab..548d2d86c 100644 --- a/pkg/kapis/kubeedge/v1alpha1/register.go +++ b/pkg/kapis/kubeedge/v1alpha1/register.go @@ -33,5 +33,7 @@ func AddToContainer(container *restful.Container, endpoint string) error { return nil } + proxy.SetProxyDesprecated() + return proxy.AddToContainer(container) }