From 736b7e4fc7f412d5eeb39bbd727305562fdabbe1 Mon Sep 17 00:00:00 2001
From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date: Mon, 24 Jul 2023 19:45:30 -0400
Subject: [PATCH 1/4] chore: add CODEOWNERS

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
---
 CODEOWNERS | 40 ++++++++++++++++++++++++++++++++++++++++
 OWNERS     | 32 --------------------------------
 2 files changed, 40 insertions(+), 32 deletions(-)
 create mode 100644 CODEOWNERS
 delete mode 100644 OWNERS

diff --git a/CODEOWNERS b/CODEOWNERS
new file mode 100644
index 0000000000000..dcb590784b4af
--- /dev/null
+++ b/CODEOWNERS
@@ -0,0 +1,40 @@
+# All
+** @argoproj/argocd-approvers
+
+# Docs
+/docs/** @argoproj/argocd-approvers
+
+# CI
+/.github/**       @argoproj/argocd-approvers
+/.goreleaser.yaml @argoproj/argocd-approvers
+
+# owners:
+# - alexmt
+# - jessesuen
+#
+# approvers:
+# - alexec
+# - alexmt
+# - jannfis
+# - jessesuen
+# - jgwest
+# - keithchong
+# - mayzhang2000
+# - rbreeze
+# - leoluz
+# - crenshaw-dev
+# - pasha-codefresh
+#
+# reviewers:
+# - terrytangyuan
+# - wtam2018
+# - ishitasequeira
+# - reginapizza
+# - hblixt
+# - chetan-rns
+# - wanghong230
+# - ciiay
+# - saumeya
+# - zachaller
+# - 34fathombelow
+# - alexef
diff --git a/OWNERS b/OWNERS
deleted file mode 100644
index 3c122f95c3dd2..0000000000000
--- a/OWNERS
+++ /dev/null
@@ -1,32 +0,0 @@
-owners:
-- alexmt
-- jessesuen
-
-approvers:
-- alexec
-- alexmt
-- jannfis
-- jessesuen
-- jgwest
-- keithchong
-- mayzhang2000
-- rbreeze
-- leoluz
-- crenshaw-dev
-- pasha-codefresh
-
-reviewers:
-- dthomson25
-- tetchel
-- terrytangyuan
-- wtam2018
-- ishitasequeira
-- reginapizza
-- hblixt
-- chetan-rns
-- wanghong230
-- ciiay
-- saumeya
-- zachaller
-- 34fathombelow
-- alexef

From 051a119ea89c6f25f0282b1702cee0ff2d6983f7 Mon Sep 17 00:00:00 2001
From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date: Mon, 18 Sep 2023 06:56:01 -0400
Subject: [PATCH 2/4] new owners

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
---
 CODEOWNERS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index dcb590784b4af..caa51a3ba96f9 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,11 +2,11 @@
 ** @argoproj/argocd-approvers
 
 # Docs
-/docs/** @argoproj/argocd-approvers
+/docs/** @argoproj/argocd-approvers @todaywasawesome @34fathombelow @blakepettersson
 
 # CI
-/.github/**       @argoproj/argocd-approvers
-/.goreleaser.yaml @argoproj/argocd-approvers
+/.github/**       @argoproj/argocd-approvers @34fathombelow
+/.goreleaser.yaml @argoproj/argocd-approvers @34fathombelow
 
 # owners:
 # - alexmt

From df5a20c6479ac7a12ccbe7dac32669e6a518ba57 Mon Sep 17 00:00:00 2001
From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date: Mon, 18 Sep 2023 08:57:16 -0400
Subject: [PATCH 3/4] use teams

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
---
 CODEOWNERS | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index caa51a3ba96f9..a6e624d833a91 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -2,11 +2,11 @@
 ** @argoproj/argocd-approvers
 
 # Docs
-/docs/** @argoproj/argocd-approvers @todaywasawesome @34fathombelow @blakepettersson
+/docs/** @argoproj/argocd-approvers @argoproj/argocd-approvers-docs
 
 # CI
-/.github/**       @argoproj/argocd-approvers @34fathombelow
-/.goreleaser.yaml @argoproj/argocd-approvers @34fathombelow
+/.github/**       @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
+/.goreleaser.yaml @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
 
 # owners:
 # - alexmt

From cf69bd9b91cf13f759aa02e6e725b5991255235e Mon Sep 17 00:00:00 2001
From: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date: Mon, 18 Sep 2023 12:43:45 -0400
Subject: [PATCH 4/4] restore old owners file

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
---
 CODEOWNERS | 31 -------------------------------
 OWNERS     | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 31 deletions(-)
 create mode 100644 OWNERS

diff --git a/CODEOWNERS b/CODEOWNERS
index a6e624d833a91..3092d462df208 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -7,34 +7,3 @@
 # CI
 /.github/**       @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
 /.goreleaser.yaml @argoproj/argocd-approvers @argoproj/argocd-approvers-ci
-
-# owners:
-# - alexmt
-# - jessesuen
-#
-# approvers:
-# - alexec
-# - alexmt
-# - jannfis
-# - jessesuen
-# - jgwest
-# - keithchong
-# - mayzhang2000
-# - rbreeze
-# - leoluz
-# - crenshaw-dev
-# - pasha-codefresh
-#
-# reviewers:
-# - terrytangyuan
-# - wtam2018
-# - ishitasequeira
-# - reginapizza
-# - hblixt
-# - chetan-rns
-# - wanghong230
-# - ciiay
-# - saumeya
-# - zachaller
-# - 34fathombelow
-# - alexef
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000000000..3c122f95c3dd2
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,32 @@
+owners:
+- alexmt
+- jessesuen
+
+approvers:
+- alexec
+- alexmt
+- jannfis
+- jessesuen
+- jgwest
+- keithchong
+- mayzhang2000
+- rbreeze
+- leoluz
+- crenshaw-dev
+- pasha-codefresh
+
+reviewers:
+- dthomson25
+- tetchel
+- terrytangyuan
+- wtam2018
+- ishitasequeira
+- reginapizza
+- hblixt
+- chetan-rns
+- wanghong230
+- ciiay
+- saumeya
+- zachaller
+- 34fathombelow
+- alexef