From 0cb444b4bee5e9c046f3bda7f3f04fea4bbe0562 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 26 Mar 2024 11:47:11 +0100 Subject: [PATCH 1/6] Owners: Sort `ingress-nginx-maintainers` & `ingress-nginx-reviewers`. --- OWNERS_ALIASES | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 44fc67d2e8..3ef02e0a82 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -11,17 +11,17 @@ aliases: - strongjz ingress-nginx-maintainers: - - rikatz - - strongjz - cpanato - puerco + - rikatz + - strongjz - tao12345666333 ingress-nginx-reviewers: + - cpanato + - puerco - rikatz - strongjz - - puerco - - cpanato - tao12345666333 ingress-nginx-helm-maintainers: From be959966329aa22a86c1d2d234b9c2216d9f875e Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 26 Mar 2024 12:03:30 +0100 Subject: [PATCH 2/6] Owners: Update URL in aliases. --- OWNERS | 4 ++-- OWNERS_ALIASES | 2 +- charts/ingress-nginx/OWNERS | 2 +- docs/OWNERS | 4 ++-- images/kube-webhook-certgen/OWNERS | 2 +- rootfs/etc/nginx/lua/OWNERS | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/OWNERS b/OWNERS index da1da1b2e3..f1e022c381 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 3ef02e0a82..4f0e914d7d 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: diff --git a/charts/ingress-nginx/OWNERS b/charts/ingress-nginx/OWNERS index 6b7e049ca8..d588ede681 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 e8b886e5b7..245cb86888 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/kube-webhook-certgen/OWNERS b/images/kube-webhook-certgen/OWNERS index ad47b2e6d7..7847edf7b8 100644 --- a/images/kube-webhook-certgen/OWNERS +++ b/images/kube-webhook-certgen/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-admins diff --git a/rootfs/etc/nginx/lua/OWNERS b/rootfs/etc/nginx/lua/OWNERS index 79814fdba9..efb1313162 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 From 96489121a575cccb58585e4533f2a4f66418ee29 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 26 Mar 2024 12:04:27 +0100 Subject: [PATCH 3/6] Images: Remove owners as it's identical to global owners. --- images/OWNERS | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 images/OWNERS diff --git a/images/OWNERS b/images/OWNERS deleted file mode 100644 index 00f162ebdc..0000000000 --- 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 From 18da67523c9cc5e017d092872b844c435aeb7c01 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 26 Mar 2024 12:05:10 +0100 Subject: [PATCH 4/6] Images: Remove global owners from `kube-webhook-certgen` owners. --- images/kube-webhook-certgen/OWNERS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images/kube-webhook-certgen/OWNERS b/images/kube-webhook-certgen/OWNERS index 7847edf7b8..b4424221c4 100644 --- a/images/kube-webhook-certgen/OWNERS +++ b/images/kube-webhook-certgen/OWNERS @@ -1,10 +1,4 @@ # See the OWNERS docs: https://www.kubernetes.dev/docs/guide/owners -approvers: -- ingress-nginx-admins -- ingress-nginx-maintainers - reviewers: -- ingress-nginx-admins -- ingress-nginx-maintainers - ingress-nginx-kube-webhook-certgen-reviewers From 3b43dbf982fd0ed437cc8bf5e78fa838923d7627 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 26 Mar 2024 12:07:23 +0100 Subject: [PATCH 5/6] 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_ALIASES | 5 ----- 1 file changed, 5 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 4f0e914d7d..7e513e11b6 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -25,20 +25,15 @@ aliases: - 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 From db604e909686cfb00b631079e731803eeaaf4e41 Mon Sep 17 00:00:00 2001 From: Marco Ebert Date: Tue, 26 Mar 2024 12:11:14 +0100 Subject: [PATCH 6/6] Owners: Promote myself to `ingress-nginx-maintainers` & `ingress-nginx-reviewers`. --- OWNERS_ALIASES | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 7e513e11b6..fa10804ce7 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -12,6 +12,7 @@ aliases: ingress-nginx-maintainers: - cpanato + - Gacko - puerco - rikatz - strongjz @@ -19,17 +20,16 @@ aliases: ingress-nginx-reviewers: - cpanato + - Gacko - puerco - rikatz - strongjz - tao12345666333 ingress-nginx-helm-maintainers: - - Gacko - ubergesundheit ingress-nginx-helm-reviewers: - - Gacko - ubergesundheit ingress-nginx-docs-maintainers: