diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index 097f61eb453..a50178ec58e 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -426,7 +426,6 @@ aliases: - vishh - mikedanese - nikhiljindal - - gmarek - davidopp - pmorie - sttts diff --git a/cmd/kube-controller-manager/OWNERS b/cmd/kube-controller-manager/OWNERS index d8eba068cd0..e9b78e9526b 100644 --- a/cmd/kube-controller-manager/OWNERS +++ b/cmd/kube-controller-manager/OWNERS @@ -18,7 +18,6 @@ reviewers: - erictune - errordeveloper - feiskyer -- gmarek - humblec - ingvagabund - janetkuo diff --git a/pkg/api/v1/OWNERS b/pkg/api/v1/OWNERS index 66ba3983fad..f6caecffa33 100644 --- a/pkg/api/v1/OWNERS +++ b/pkg/api/v1/OWNERS @@ -14,7 +14,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - erictune - davidopp - pmorie diff --git a/pkg/apis/OWNERS b/pkg/apis/OWNERS index 477910e3b06..675866e6e87 100644 --- a/pkg/apis/OWNERS +++ b/pkg/apis/OWNERS @@ -21,7 +21,6 @@ filters: - mikedanese - liggitt - nikhiljindal - - gmarek - erictune - pmorie - sttts diff --git a/pkg/apis/core/OWNERS b/pkg/apis/core/OWNERS index a689545f7bf..8c1fe8b778d 100644 --- a/pkg/apis/core/OWNERS +++ b/pkg/apis/core/OWNERS @@ -20,7 +20,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - erictune - davidopp - pmorie diff --git a/pkg/apis/core/v1/OWNERS b/pkg/apis/core/v1/OWNERS index 66ba3983fad..f6caecffa33 100644 --- a/pkg/apis/core/v1/OWNERS +++ b/pkg/apis/core/v1/OWNERS @@ -14,7 +14,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - erictune - davidopp - pmorie diff --git a/pkg/apis/core/validation/OWNERS b/pkg/apis/core/validation/OWNERS index 861d1efdce8..f7e2fdd2fce 100644 --- a/pkg/apis/core/validation/OWNERS +++ b/pkg/apis/core/validation/OWNERS @@ -14,7 +14,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - erictune - davidopp - pmorie diff --git a/pkg/client/OWNERS b/pkg/client/OWNERS index 679be691790..7a6318b0ab8 100644 --- a/pkg/client/OWNERS +++ b/pkg/client/OWNERS @@ -20,7 +20,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - erictune - davidopp - pmorie diff --git a/pkg/cloudprovider/OWNERS b/pkg/cloudprovider/OWNERS index 5f003357ffe..fced06c888d 100644 --- a/pkg/cloudprovider/OWNERS +++ b/pkg/cloudprovider/OWNERS @@ -18,7 +18,6 @@ reviewers: - vishh - mikedanese - liggitt -- gmarek - erictune - davidopp - pmorie diff --git a/pkg/controller/nodeipam/OWNERS b/pkg/controller/nodeipam/OWNERS index 0a59082f424..98d1d61c355 100644 --- a/pkg/controller/nodeipam/OWNERS +++ b/pkg/controller/nodeipam/OWNERS @@ -1,13 +1,14 @@ # See the OWNERS docs at https://go.k8s.io/owners approvers: -- gmarek - bowei reviewers: -- gmarek - smarterclayton - ingvagabund - aveshagarwal - k82cn labels: - sig/network + +emeritus_approvers: +- gmarek diff --git a/pkg/controller/nodelifecycle/OWNERS b/pkg/controller/nodelifecycle/OWNERS index b1dae75b5c6..fc1089bbb78 100644 --- a/pkg/controller/nodelifecycle/OWNERS +++ b/pkg/controller/nodelifecycle/OWNERS @@ -1,12 +1,13 @@ # See the OWNERS docs at https://go.k8s.io/owners approvers: -- gmarek - bowei - k82cn reviewers: -- gmarek - smarterclayton - ingvagabund - aveshagarwal - k82cn + +emeritus_approvers: +- gmarek diff --git a/pkg/controller/podgc/OWNERS b/pkg/controller/podgc/OWNERS index f2c85258423..1e3f11e35c8 100644 --- a/pkg/controller/podgc/OWNERS +++ b/pkg/controller/podgc/OWNERS @@ -2,7 +2,8 @@ approvers: - foxish -- gmarek reviewers: - foxish + +emeritus_approvers: - gmarek diff --git a/pkg/controlplane/OWNERS b/pkg/controlplane/OWNERS index 77950e3559a..368dc2662f6 100644 --- a/pkg/controlplane/OWNERS +++ b/pkg/controlplane/OWNERS @@ -20,7 +20,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - erictune - davidopp - pmorie diff --git a/pkg/kubemark/OWNERS b/pkg/kubemark/OWNERS index f9874e1757c..df181209070 100644 --- a/pkg/kubemark/OWNERS +++ b/pkg/kubemark/OWNERS @@ -1,12 +1,13 @@ # See the OWNERS docs at https://go.k8s.io/owners reviewers: - - gmarek - shyamjvs - sig-scalability-reviewers - wojtek-t approvers: - - gmarek - shyamjvs - sig-scalability-approvers - wojtek-t + +emeritus_approvers: +- gmarek diff --git a/pkg/registry/events/OWNERS b/pkg/registry/events/OWNERS index 809c2fc457c..962a1bc34cd 100644 --- a/pkg/registry/events/OWNERS +++ b/pkg/registry/events/OWNERS @@ -1,10 +1,11 @@ # See the OWNERS docs at https://go.k8s.io/owners reviewers: -- gmarek - deads2k - sttts approvers: -- gmarek - deads2k - sttts + +emeritus_approvers: +- gmarek diff --git a/pkg/registry/registrytest/OWNERS b/pkg/registry/registrytest/OWNERS index 350d4e212f1..9308af1fab1 100644 --- a/pkg/registry/registrytest/OWNERS +++ b/pkg/registry/registrytest/OWNERS @@ -12,7 +12,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - erictune - pmorie - timothysc diff --git a/staging/src/k8s.io/apimachinery/OWNERS b/staging/src/k8s.io/apimachinery/OWNERS index 5ef61ab7cd0..696f623151a 100644 --- a/staging/src/k8s.io/apimachinery/OWNERS +++ b/staging/src/k8s.io/apimachinery/OWNERS @@ -18,7 +18,6 @@ reviewers: - cheftako - mikedanese - liggitt -- gmarek - sttts - ncdc - logicalhan diff --git a/staging/src/k8s.io/apimachinery/pkg/api/errors/OWNERS b/staging/src/k8s.io/apimachinery/pkg/api/errors/OWNERS index d18a17885b6..93bf16b1e9c 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/errors/OWNERS +++ b/staging/src/k8s.io/apimachinery/pkg/api/errors/OWNERS @@ -12,7 +12,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - erictune - saad-ali - janetkuo diff --git a/staging/src/k8s.io/apimachinery/pkg/api/meta/OWNERS b/staging/src/k8s.io/apimachinery/pkg/api/meta/OWNERS index 68b8d353ca9..26d04dc4d9f 100644 --- a/staging/src/k8s.io/apimachinery/pkg/api/meta/OWNERS +++ b/staging/src/k8s.io/apimachinery/pkg/api/meta/OWNERS @@ -11,7 +11,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - janetkuo - ncdc - dims diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS index 40018601c08..6055835b61d 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/OWNERS @@ -9,7 +9,6 @@ reviewers: - caesarxuchao - liggitt - nikhiljindal -- gmarek - erictune - davidopp - sttts diff --git a/staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS b/staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS index 3ac0d161dc5..b78b558b65e 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS +++ b/staging/src/k8s.io/apiserver/pkg/registry/generic/OWNERS @@ -12,7 +12,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - davidopp - saad-ali - janetkuo diff --git a/staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS b/staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS index 55e6178184c..17827309bab 100644 --- a/staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS +++ b/staging/src/k8s.io/apiserver/pkg/registry/rest/OWNERS @@ -11,7 +11,6 @@ reviewers: - mikedanese - liggitt - nikhiljindal -- gmarek - justinsb - ncdc - dims diff --git a/staging/src/k8s.io/client-go/rest/OWNERS b/staging/src/k8s.io/client-go/rest/OWNERS index c02ec6a250f..b774f425e2d 100644 --- a/staging/src/k8s.io/client-go/rest/OWNERS +++ b/staging/src/k8s.io/client-go/rest/OWNERS @@ -9,7 +9,6 @@ reviewers: - brendandburns - liggitt - nikhiljindal -- gmarek - erictune - sttts - luxas diff --git a/staging/src/k8s.io/client-go/tools/leaderelection/OWNERS b/staging/src/k8s.io/client-go/tools/leaderelection/OWNERS index 9ece5e1ea4b..2ba793ee80f 100644 --- a/staging/src/k8s.io/client-go/tools/leaderelection/OWNERS +++ b/staging/src/k8s.io/client-go/tools/leaderelection/OWNERS @@ -7,7 +7,6 @@ reviewers: - wojtek-t - deads2k - mikedanese -- gmarek - timothysc - ingvagabund - resouer diff --git a/staging/src/k8s.io/cloud-provider/OWNERS b/staging/src/k8s.io/cloud-provider/OWNERS index b5c5205c9d8..b0ef2b6f554 100644 --- a/staging/src/k8s.io/cloud-provider/OWNERS +++ b/staging/src/k8s.io/cloud-provider/OWNERS @@ -13,7 +13,6 @@ reviewers: - vishh - mikedanese - liggitt -- gmarek - davidopp - pmorie - sttts diff --git a/staging/src/k8s.io/cloud-provider/controllers/route/OWNERS b/staging/src/k8s.io/cloud-provider/controllers/route/OWNERS index 287ab38fb77..c47b9de717d 100644 --- a/staging/src/k8s.io/cloud-provider/controllers/route/OWNERS +++ b/staging/src/k8s.io/cloud-provider/controllers/route/OWNERS @@ -1,13 +1,14 @@ # See the OWNERS docs at https://go.k8s.io/owners approvers: -- gmarek - wojtek-t - bowei - andrewsykim - cheftako reviewers: -- gmarek - wojtek-t - andrewsykim - cheftako + +emeritus_approvers: +- gmarek