From 2f3800e100727a5b880dcf64d392c7986442d135 Mon Sep 17 00:00:00 2001
From: Dan Winship <danwinship@redhat.com>
Date: Sat, 18 Mar 2023 08:33:29 -0400
Subject: [PATCH 1/3] Make pkg/util/iptables and pkg/util/ipvs owned by
 sig-network

---
 pkg/util/iptables/OWNERS | 10 ++--------
 pkg/util/ipvs/OWNERS     |  6 ++----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkg/util/iptables/OWNERS b/pkg/util/iptables/OWNERS
index 80a5e13e308..548730fa952 100644
--- a/pkg/util/iptables/OWNERS
+++ b/pkg/util/iptables/OWNERS
@@ -1,14 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 reviewers:
-  - dcbw
-  - thockin
-  - danwinship
+  - sig-network-reviewers
 approvers:
-  - dcbw
-  - thockin
-  - danwinship
-emeritus_approvers:
-  - eparis
+  - sig-network-approvers
 labels:
   - sig/network
diff --git a/pkg/util/ipvs/OWNERS b/pkg/util/ipvs/OWNERS
index 44fd07aeee5..998887a974e 100644
--- a/pkg/util/ipvs/OWNERS
+++ b/pkg/util/ipvs/OWNERS
@@ -1,12 +1,10 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 reviewers:
-  - thockin
-  - andrewsykim
+  - sig-network-reviewers
   - uablrek
 approvers:
-  - thockin
-  - andrewsykim
+  - sig-network-approvers
   - uablrek
 labels:
   - sig/network

From fc8892d26d7149998e0c5d8f74103aa42368315f Mon Sep 17 00:00:00 2001
From: Dan Winship <danwinship@redhat.com>
Date: Sat, 18 Mar 2023 08:32:58 -0400
Subject: [PATCH 2/3] Add more labels (esp. area/kube-proxy) to sig-network
 OWNERS

---
 cmd/kube-proxy/OWNERS                | 1 +
 pkg/proxy/OWNERS                     | 1 +
 pkg/proxy/winkernel/OWNERS           | 2 ++
 staging/src/k8s.io/kube-proxy/OWNERS | 3 +++
 4 files changed, 7 insertions(+)

diff --git a/cmd/kube-proxy/OWNERS b/cmd/kube-proxy/OWNERS
index 548730fa952..718fa4059ee 100644
--- a/cmd/kube-proxy/OWNERS
+++ b/cmd/kube-proxy/OWNERS
@@ -6,3 +6,4 @@ approvers:
   - sig-network-approvers
 labels:
   - sig/network
+  - area/kube-proxy
diff --git a/pkg/proxy/OWNERS b/pkg/proxy/OWNERS
index 675d11afb44..c2ea7233a53 100644
--- a/pkg/proxy/OWNERS
+++ b/pkg/proxy/OWNERS
@@ -6,3 +6,4 @@ reviewers:
   - sig-network-reviewers
 labels:
   - sig/network
+  - area/kube-proxy
diff --git a/pkg/proxy/winkernel/OWNERS b/pkg/proxy/winkernel/OWNERS
index eec557c644c..7e668b23818 100644
--- a/pkg/proxy/winkernel/OWNERS
+++ b/pkg/proxy/winkernel/OWNERS
@@ -10,6 +10,8 @@ reviewers:
   - daschott
 labels:
   - sig/network
+  - sig/windows
+  - area/kube-proxy
 emeritus_approvers:
   - dineshgovindasamy
   - ksubrmnn
diff --git a/staging/src/k8s.io/kube-proxy/OWNERS b/staging/src/k8s.io/kube-proxy/OWNERS
index c6fb94a1043..261ef02fa5e 100644
--- a/staging/src/k8s.io/kube-proxy/OWNERS
+++ b/staging/src/k8s.io/kube-proxy/OWNERS
@@ -8,3 +8,6 @@ reviewers:
   - sig-network-reviewers
   - luxas
   - sttts
+labels:
+  - sig/network
+  - area/kube-proxy

From db5590a194b76d09500f9b684780e39f4749d93c Mon Sep 17 00:00:00 2001
From: Dan Winship <danwinship@redhat.com>
Date: Sat, 18 Mar 2023 08:30:26 -0400
Subject: [PATCH 3/3] Remove sig-network-driver-approvers alias

This previously existed so the dockershim networking stuff had
different approvers than general sig-network stuff, but that code is
gone now, and the remaining kubelet DNS code should be owned by
sig-network in general (and sig-node via inheritance).
---
 OWNERS_ALIASES             | 3 ---
 pkg/kubelet/network/OWNERS | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 6ae260fcb11..00d8c72513b 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -247,9 +247,6 @@ aliases:
     - bobbypage
     - pacoxu
     - bart0sh
-  sig-network-driver-approvers:
-    - dcbw
-    - freehan
   sig-network-approvers:
     - andrewsykim
     - aojea
diff --git a/pkg/kubelet/network/OWNERS b/pkg/kubelet/network/OWNERS
index 6c3eaa8827d..71e48c9c0fc 100644
--- a/pkg/kubelet/network/OWNERS
+++ b/pkg/kubelet/network/OWNERS
@@ -1,7 +1,7 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 approvers:
-  - sig-network-driver-approvers
+  - sig-network-approvers
 emeritus_approvers:
   - matchstick
 reviewers: