diff --git a/cmd/kubemark/app/hollow_node.go b/cmd/kubemark/app/hollow_node.go index 6403dd62d2c..7ad5e061e11 100644 --- a/cmd/kubemark/app/hollow_node.go +++ b/cmd/kubemark/app/hollow_node.go @@ -51,6 +51,7 @@ import ( "k8s.io/kubernetes/pkg/kubelet/cri/remote" fakeremote "k8s.io/kubernetes/pkg/kubelet/cri/remote/fake" "k8s.io/kubernetes/pkg/kubemark" + kubemarkproxy "k8s.io/kubernetes/pkg/proxy/kubemark" utilflag "k8s.io/kubernetes/pkg/util/flag" fakeiptables "k8s.io/kubernetes/pkg/util/iptables/testing" fakeexec "k8s.io/utils/exec/testing" @@ -279,7 +280,7 @@ func run(config *hollowNodeConfig) error { eventBroadcaster := events.NewBroadcaster(&events.EventSinkImpl{Interface: client.EventsV1()}) recorder := eventBroadcaster.NewRecorder(legacyscheme.Scheme, "kube-proxy") - hollowProxy, err := kubemark.NewHollowProxyOrDie( + hollowProxy, err := kubemarkproxy.NewHollowProxyOrDie( config.NodeName, client, client.CoreV1(), diff --git a/pkg/kubemark/.import-restrictions b/pkg/kubemark/.import-restrictions index 5bcdf7301be..6390404bd0e 100644 --- a/pkg/kubemark/.import-restrictions +++ b/pkg/kubemark/.import-restrictions @@ -2,5 +2,4 @@ rules: # override pkg/ import restriction on cmd/ for kubemark - selectorRegexp: k8s[.]io/kubernetes/cmd allowedPrefixes: - - k8s.io/kubernetes/cmd/kube-proxy/app - k8s.io/kubernetes/cmd/kubelet/app diff --git a/pkg/proxy/kubemark/.import-restrictions b/pkg/proxy/kubemark/.import-restrictions new file mode 100644 index 00000000000..d333ec6b4fa --- /dev/null +++ b/pkg/proxy/kubemark/.import-restrictions @@ -0,0 +1,6 @@ +rules: + # override pkg/ import restriction on cmd/ for kubemark + - selectorRegexp: k8s[.]io/kubernetes/cmd + allowedPrefixes: + - k8s.io/kubernetes/cmd/kube-proxy/app + diff --git a/pkg/proxy/kubemark/OWNERS b/pkg/proxy/kubemark/OWNERS new file mode 100644 index 00000000000..16eb9516d79 --- /dev/null +++ b/pkg/proxy/kubemark/OWNERS @@ -0,0 +1,14 @@ +# See the OWNERS docs at https://go.k8s.io/owners + +reviewers: + - shyamjvs + - sig-scalability-reviewers + - wojtek-t +approvers: + - shyamjvs + - sig-scalability-approvers + - wojtek-t +emeritus_approvers: + - gmarek +labels: + - sig/scalability diff --git a/pkg/kubemark/hollow_proxy.go b/pkg/proxy/kubemark/hollow_proxy.go similarity index 100% rename from pkg/kubemark/hollow_proxy.go rename to pkg/proxy/kubemark/hollow_proxy.go