From 33bf063af0076e85387a2414ca1911436e02ae7f Mon Sep 17 00:00:00 2001
From: Carlos Tadeu Panato Junior <ctadeu@gmail.com>
Date: Fri, 16 Jul 2021 16:10:11 +0200
Subject: [PATCH] update OWNERS and aliases files (#7365) (#7366)

Signed-off-by: Carlos Panato <ctadeu@gmail.com>
---
 OWNERS                      | 16 +++++-----------
 OWNERS_ALIASES              | 30 ++++++++++++++++++++++++++----
 charts/ingress-nginx/OWNERS |  6 ++++--
 images/OWNERS               | 10 ++++++----
 4 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/OWNERS b/OWNERS
index 24754703a..1d90c4cd5 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,18 +1,12 @@
 # See the OWNERS docs: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md
 
 approvers:
-  - ingress-nginx-admins
-  - ingress-nginx-maintainers
-  - ElvinEfendi
-  - rikatz
-  - strongjz
+- ingress-nginx-admins
+- ingress-nginx-maintainers
+- sig-network-leads
 
 reviewers:
-  - ElvinEfendi
-  - cmluciano
-  - rikatz
-  - strongjz
-  - tao12345666333
+- ingress-nginx-reviewers
 
 emeritus_approvers:
-  - aledbf  # 2020-04-02
+- aledbf  # 2020-04-02
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 30f781cfc..b313f36b8 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -2,9 +2,31 @@
 
 aliases:
   sig-network-leads:
-    - caseydavenport
-    - dcbw
-    - thockin
+  - caseydavenport
+  - dcbw
+  - thockin
+
   ingress-nginx-admins:
-    - bowei
+  - bowei
+  - rikatz
+
   ingress-nginx-maintainers:
+  - ElvinEfendi
+  - justinsb
+  - rikatz
+  - strongjz
+
+  ingress-nginx-reviewers:
+  - ElvinEfendi
+  - cmluciano
+  - rikatz
+  - strongjz
+  - tao12345666333
+
+  ingress-nginx-helm-maintainers:
+  - ChiefAlexander
+  - cpanato
+
+  ingress-nginx-helm-reviewers:
+  - ChiefAlexander
+  - cpanato
diff --git a/charts/ingress-nginx/OWNERS b/charts/ingress-nginx/OWNERS
index 7aadb8dc2..a31654fff 100644
--- a/charts/ingress-nginx/OWNERS
+++ b/charts/ingress-nginx/OWNERS
@@ -1,5 +1,7 @@
+# See the OWNERS docs: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md
+
 approvers:
-  - ChiefAlexander
+- ingress-nginx-helm-maintainers
 
 reviewers:
-  - ChiefAlexander
+- ingress-nginx-helm-reviewers
diff --git a/images/OWNERS b/images/OWNERS
index b135a937c..00f162ebd 100644
--- a/images/OWNERS
+++ b/images/OWNERS
@@ -1,7 +1,9 @@
+# See the OWNERS docs: https://github.com/kubernetes/community/blob/master/contributors/guide/owners.md
+
 approvers:
-- aledbf
-- ElvinEfendi
+- ingress-nginx-admins
+- ingress-nginx-maintainers
 
 reviewers:
-- ElvinEfendi
-- aledbf
+- ingress-nginx-admins
+- ingress-nginx-maintainers