From bf3fa531676ce2b61effb55f5a94345dbc382d09 Mon Sep 17 00:00:00 2001
From: Marco Ebert <marco_ebert@icloud.com>
Date: Thu, 4 Apr 2024 17:01:10 +0200
Subject: [PATCH] Owners: Promote Gacko to `ingress-nginx-maintainers` &
 `ingress-nginx-reviewers`. (#11165)

* Owners: Sort `ingress-nginx-maintainers` & `ingress-nginx-reviewers`.

* Owners: Update URL in aliases.

* Images: Remove owners as it's identical to global owners.

* Images: Remove global owners from `kube-webhook-certgen` owners.

* Owners: Remove members from aliases covered by other aliases.

ingress-nginx-helm-maintainers:
- cpanato: Covered by ingress-nginx-maintainers
- strongjz: Covered by ingress-nginx-maintainers

ingress-nginx-helm-reviewers:
- cpanato: Covered by ingress-nginx-reviewers
- strongjz: Covered by ingress-nginx-reviewers

ingress-nginx-docs-maintainers:
- tao12345666333: Covered by ingress-nginx-maintainers

* Owners: Promote myself to `ingress-nginx-maintainers` & `ingress-nginx-reviewers`.
---
 OWNERS                             |  4 ++--
 OWNERS_ALIASES                     | 19 +++++++------------
 charts/ingress-nginx/OWNERS        |  2 +-
 docs/OWNERS                        |  4 ++--
 images/OWNERS                      |  9 ---------
 images/kube-webhook-certgen/OWNERS |  8 +-------
 rootfs/etc/nginx/lua/OWNERS        |  4 ++--
 7 files changed, 15 insertions(+), 35 deletions(-)
 delete mode 100644 images/OWNERS

diff --git a/OWNERS b/OWNERS
index da1da1b2e..f1e022c38 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,4 +1,4 @@
-# See the OWNERS docs: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md
+# See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
 
 approvers:
 - ingress-nginx-maintainers
@@ -7,6 +7,6 @@ reviewers:
 - ingress-nginx-reviewers
 
 emeritus_approvers:
-- aledbf  # 2020-04-02
+- aledbf # 2020-04-02
 - bowei # 2022-10-12
 - ElvinEfendi # 2023-04-23
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 44fc67d2e..fa10804ce 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -1,4 +1,4 @@
-# See the OWNERS docs: https://git.k8s.io/community/docs/devel/owners.md
+# See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
 
 aliases:
   sig-network-leads:
@@ -11,34 +11,29 @@ aliases:
   - strongjz
 
   ingress-nginx-maintainers:
+  - cpanato
+  - Gacko
+  - puerco
   - rikatz
   - strongjz
-  - cpanato
-  - puerco
   - tao12345666333
 
   ingress-nginx-reviewers:
+  - cpanato
+  - Gacko
+  - puerco
   - rikatz
   - strongjz
-  - puerco
-  - cpanato
   - tao12345666333
 
   ingress-nginx-helm-maintainers:
-  - cpanato
-  - Gacko
-  - strongjz
   - ubergesundheit
 
   ingress-nginx-helm-reviewers:
-  - cpanato
-  - Gacko
-  - strongjz
   - ubergesundheit
 
   ingress-nginx-docs-maintainers:
   - longwuyuan
-  - tao12345666333
 
   ingress-nginx-kube-webhook-certgen-reviewers:
   - invidian
diff --git a/charts/ingress-nginx/OWNERS b/charts/ingress-nginx/OWNERS
index 6b7e049ca..d588ede68 100644
--- a/charts/ingress-nginx/OWNERS
+++ b/charts/ingress-nginx/OWNERS
@@ -1,4 +1,4 @@
-# See the OWNERS docs: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md
+# See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
 
 approvers:
 - ingress-nginx-helm-maintainers
diff --git a/docs/OWNERS b/docs/OWNERS
index e8b886e5b..245cb8688 100644
--- a/docs/OWNERS
+++ b/docs/OWNERS
@@ -1,7 +1,7 @@
-# See the OWNERS docs: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md
+# See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
 
 approvers:
 - ingress-nginx-docs-maintainers
 
 labels:
-- area/docs
\ No newline at end of file
+- area/docs
diff --git a/images/OWNERS b/images/OWNERS
deleted file mode 100644
index 00f162ebd..000000000
--- a/images/OWNERS
+++ /dev/null
@@ -1,9 +0,0 @@
-# See the OWNERS docs: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md
-
-approvers:
-- ingress-nginx-admins
-- ingress-nginx-maintainers
-
-reviewers:
-- ingress-nginx-admins
-- ingress-nginx-maintainers
diff --git a/images/kube-webhook-certgen/OWNERS b/images/kube-webhook-certgen/OWNERS
index ad47b2e6d..b4424221c 100644
--- a/images/kube-webhook-certgen/OWNERS
+++ b/images/kube-webhook-certgen/OWNERS
@@ -1,10 +1,4 @@
-# See the OWNERS docs: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md
-
-approvers:
-- ingress-nginx-admins
-- ingress-nginx-maintainers
+# See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
 
 reviewers:
-- ingress-nginx-admins
-- ingress-nginx-maintainers
 - ingress-nginx-kube-webhook-certgen-reviewers
diff --git a/rootfs/etc/nginx/lua/OWNERS b/rootfs/etc/nginx/lua/OWNERS
index 79814fdba..efb131316 100644
--- a/rootfs/etc/nginx/lua/OWNERS
+++ b/rootfs/etc/nginx/lua/OWNERS
@@ -1,4 +1,4 @@
-# See the OWNERS docs: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md
+# See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners
 
 labels:
-- area/lua
\ No newline at end of file
+- area/lua