Merge pull request #116605 from danwinship/hollow-proxy

Move hollow_proxy.go from pkg/kubemark to pkg/proxy/kubemark

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(),

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

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
+

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