From a23e44216102f6d1995e0885d52f0d50c2776012 Mon Sep 17 00:00:00 2001 From: Vallery Lancey Date: Wed, 13 Mar 2019 21:43:06 -0700 Subject: [PATCH] Fix a bad merge leftover in kube-proxy --- cmd/kube-proxy/app/server.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmd/kube-proxy/app/server.go b/cmd/kube-proxy/app/server.go index 791456326e2..f6f7b929e99 100644 --- a/cmd/kube-proxy/app/server.go +++ b/cmd/kube-proxy/app/server.go @@ -39,8 +39,7 @@ import ( "k8s.io/apiserver/pkg/server/mux" "k8s.io/apiserver/pkg/server/routes" utilfeature "k8s.io/apiserver/pkg/util/feature" - "k8s.io/apiserver/pkg/util/flag" - informers "k8s.io/client-go/informers" + "k8s.io/client-go/informers" clientset "k8s.io/client-go/kubernetes" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "k8s.io/client-go/rest"