From 737eda577fe47475b01e797f654a3b5bc495ec75 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 16 Jul 2026 12:41:18 -0400 Subject: [PATCH 1/3] Remove overrides of approve/lgtm config in Core Networking repos Use the standard config (in particular, lgtm=approve) everywhere. --- .../cloud-network-config-controller/_pluginconfig.yaml | 9 --------- .../openshift/egress-router-cni/_pluginconfig.yaml | 8 -------- .../openshift/ingress-node-firewall/_pluginconfig.yaml | 8 -------- 3 files changed, 25 deletions(-) diff --git a/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml b/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml index 3cc433b3cc939..5ec6d23eea31e 100644 --- a/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml @@ -1,8 +1,3 @@ -approve: -- lgtm_acts_as_approve: true - repos: - - openshift/cloud-network-config-controller - require_self_approval: false label: restricted_labels: openshift/cloud-network-config-controller: @@ -35,10 +30,6 @@ label: assign_on: - label: backport-risk-assessed label: cherry-pick-approved -lgtm: -- repos: - - openshift/cloud-network-config-controller - review_acts_as_lgtm: true plugins: openshift/cloud-network-config-controller: plugins: diff --git a/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml b/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml index 8731c16dbcce3..d2e13a6e5e8b9 100644 --- a/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml @@ -1,7 +1,3 @@ -approve: -- repos: - - openshift/egress-router-cni - require_self_approval: false label: restricted_labels: openshift/egress-router-cni: @@ -21,10 +17,6 @@ label: assign_on: - label: backport-risk-assessed label: cherry-pick-approved -lgtm: -- repos: - - openshift/egress-router-cni - review_acts_as_lgtm: true plugins: openshift/egress-router-cni: plugins: diff --git a/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml b/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml index a06402f7fc085..dc3026b9f4711 100644 --- a/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml @@ -1,7 +1,3 @@ -approve: -- repos: - - openshift/ingress-node-firewall - require_self_approval: false label: restricted_labels: openshift/ingress-node-firewall: @@ -16,10 +12,6 @@ label: - asood-rh - anuragthehatter label: cherry-pick-approved -lgtm: -- repos: - - openshift/ingress-node-firewall - review_acts_as_lgtm: true plugins: openshift/ingress-node-firewall: plugins: From 6fe2da40cb55ece8b757380042fead851768c9ca Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 16 Jul 2026 12:43:26 -0400 Subject: [PATCH 2/3] Remove cherry-pick-approved config from Core Networking repos We aren't using cherry-pick-approved any more; there's no reason to spam current and former QE team members about it. --- .../_pluginconfig.yaml | 16 ---------------- .../cluster-network-operator/_pluginconfig.yaml | 17 ----------------- .../egress-router-cni/_pluginconfig.yaml | 16 ---------------- .../ingress-node-firewall/_pluginconfig.yaml | 4 ---- .../openshift/network-tools/_pluginconfig.yaml | 16 ---------------- .../openshift/ovn-kubernetes/_pluginconfig.yaml | 16 ---------------- .../02_config/openshift/sdn/_pluginconfig.yaml | 16 ---------------- 7 files changed, 101 deletions(-) diff --git a/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml b/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml index 5ec6d23eea31e..9255870cd8b04 100644 --- a/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml @@ -14,22 +14,6 @@ label: - ricky-rav - tssurya label: backport-risk-assessed - - allowed_users: - - mffiedler - - rbbratta - - zhaozhanqi - - weliang1 - - anuragthehatter - - huiran0826 - - asood-rh - - yingwang-0320 - - qiowang721 - - jechen0648 - - Meina-rh - - barbora137 - assign_on: - - label: backport-risk-assessed - label: cherry-pick-approved plugins: openshift/cloud-network-config-controller: plugins: diff --git a/core-services/prow/02_config/openshift/cluster-network-operator/_pluginconfig.yaml b/core-services/prow/02_config/openshift/cluster-network-operator/_pluginconfig.yaml index c0fdfb2441f23..1e717e824d7b7 100644 --- a/core-services/prow/02_config/openshift/cluster-network-operator/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-network-operator/_pluginconfig.yaml @@ -12,23 +12,6 @@ label: - tssurya - dougbtv label: backport-risk-assessed - - allowed_users: - - mffiedler - - rbbratta - - zhaozhanqi - - weliang1 - - anuragthehatter - - huiran0826 - - asood-rh - - yingwang-0320 - - qiowang721 - - jechen0648 - - imatza-rh - - Meina-rh - - barbora137 - assign_on: - - label: backport-risk-assessed - label: cherry-pick-approved plugins: openshift/cluster-network-operator: plugins: diff --git a/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml b/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml index d2e13a6e5e8b9..9edcd91893308 100644 --- a/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml @@ -1,22 +1,6 @@ label: restricted_labels: openshift/egress-router-cni: - - allowed_users: - - mffiedler - - rbbratta - - zhaozhanqi - - weliang1 - - anuragthehatter - - huiran0826 - - asood-rh - - yingwang-0320 - - qiowang721 - - jechen0648 - - Meina-rh - - barbora137 - assign_on: - - label: backport-risk-assessed - label: cherry-pick-approved plugins: openshift/egress-router-cni: plugins: diff --git a/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml b/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml index dc3026b9f4711..e60585591f207 100644 --- a/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml @@ -8,10 +8,6 @@ label: - msherif1234 - trozet label: backport-risk-assessed - - allowed_users: - - asood-rh - - anuragthehatter - label: cherry-pick-approved plugins: openshift/ingress-node-firewall: plugins: diff --git a/core-services/prow/02_config/openshift/network-tools/_pluginconfig.yaml b/core-services/prow/02_config/openshift/network-tools/_pluginconfig.yaml index 4c7da0ff196a1..4cc6a6883a792 100644 --- a/core-services/prow/02_config/openshift/network-tools/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/network-tools/_pluginconfig.yaml @@ -8,22 +8,6 @@ label: - trozet - npinaeva label: backport-risk-assessed - - allowed_users: - - mffiedler - - rbbratta - - zhaozhanqi - - weliang1 - - anuragthehatter - - huiran0826 - - asood-rh - - yingwang-0320 - - qiowang721 - - jechen0648 - - Meina-rh - - barbora137 - assign_on: - - label: backport-risk-assessed - label: cherry-pick-approved plugins: openshift/network-tools: plugins: diff --git a/core-services/prow/02_config/openshift/ovn-kubernetes/_pluginconfig.yaml b/core-services/prow/02_config/openshift/ovn-kubernetes/_pluginconfig.yaml index f9448d54879b7..ebcb785101644 100644 --- a/core-services/prow/02_config/openshift/ovn-kubernetes/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/ovn-kubernetes/_pluginconfig.yaml @@ -10,22 +10,6 @@ label: - pperiyasamy - tssurya label: backport-risk-assessed - - allowed_users: - - anuragthehatter - - mffiedler - - rbbratta - - zhaozhanqi - - weliang1 - - huiran0826 - - asood-rh - - yingwang-0320 - - qiowang721 - - jechen0648 - - Meina-rh - - barbora137 - assign_on: - - label: backport-risk-assessed - label: cherry-pick-approved plugins: openshift/ovn-kubernetes: plugins: diff --git a/core-services/prow/02_config/openshift/sdn/_pluginconfig.yaml b/core-services/prow/02_config/openshift/sdn/_pluginconfig.yaml index 716e92110e1cc..1a4cd7ed4519f 100644 --- a/core-services/prow/02_config/openshift/sdn/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/sdn/_pluginconfig.yaml @@ -8,22 +8,6 @@ label: - danwinship - trozet label: backport-risk-assessed - - allowed_users: - - mffiedler - - rbbratta - - zhaozhanqi - - weliang1 - - anuragthehatter - - huiran0826 - - asood-rh - - yingwang-0320 - - qiowang721 - - jechen0648 - - Meina-rh - - barbora137 - assign_on: - - label: backport-risk-assessed - label: cherry-pick-approved plugins: openshift/sdn: plugins: From 2734500dc87d8cde2940d60371629be3f5ddcd50 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Thu, 16 Jul 2026 12:45:14 -0400 Subject: [PATCH 3/3] Sync backport-risk-assessed lists in Core Networking repos Mostly synced from CNO, but ovn-kubernetes is slightly different. --- .../cloud-network-config-controller/_pluginconfig.yaml | 6 +----- .../openshift/cluster-network-operator/_pluginconfig.yaml | 3 --- .../openshift/egress-router-cni/_pluginconfig.yaml | 8 ++++++++ .../openshift/ingress-node-firewall/_pluginconfig.yaml | 7 ++++--- .../02_config/openshift/network-tools/_pluginconfig.yaml | 5 +++-- .../02_config/openshift/ovn-kubernetes/_pluginconfig.yaml | 1 - 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml b/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml index 9255870cd8b04..760264e168ca1 100644 --- a/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/cloud-network-config-controller/_pluginconfig.yaml @@ -4,14 +4,10 @@ label: - allowed_teams: - openshift-staff-engineers allowed_users: - - abhat - danwinship - - dcbw - - knobunc + - jcaamano - kyrtapz - - martinkennelly - pperiyasamy - - ricky-rav - tssurya label: backport-risk-assessed plugins: diff --git a/core-services/prow/02_config/openshift/cluster-network-operator/_pluginconfig.yaml b/core-services/prow/02_config/openshift/cluster-network-operator/_pluginconfig.yaml index 1e717e824d7b7..df6294c804be5 100644 --- a/core-services/prow/02_config/openshift/cluster-network-operator/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/cluster-network-operator/_pluginconfig.yaml @@ -7,10 +7,7 @@ label: - danwinship - jcaamano - kyrtapz - - MaysaMacedo - - pliurh - tssurya - - dougbtv label: backport-risk-assessed plugins: openshift/cluster-network-operator: diff --git a/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml b/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml index 9edcd91893308..394704d745400 100644 --- a/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/egress-router-cni/_pluginconfig.yaml @@ -1,6 +1,14 @@ label: restricted_labels: openshift/egress-router-cni: + - allowed_teams: + - openshift-staff-engineers + allowed_users: + - danwinship + - jcaamano + - kyrtapz + - tssurya + label: backport-risk-assessed plugins: openshift/egress-router-cni: plugins: diff --git a/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml b/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml index e60585591f207..912bbd4833cf9 100644 --- a/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/ingress-node-firewall/_pluginconfig.yaml @@ -4,9 +4,10 @@ label: - allowed_teams: - openshift-staff-engineers allowed_users: - - knobunc - - msherif1234 - - trozet + - danwinship + - jcaamano + - kyrtapz + - tssurya label: backport-risk-assessed plugins: openshift/ingress-node-firewall: diff --git a/core-services/prow/02_config/openshift/network-tools/_pluginconfig.yaml b/core-services/prow/02_config/openshift/network-tools/_pluginconfig.yaml index 4cc6a6883a792..81412060cea14 100644 --- a/core-services/prow/02_config/openshift/network-tools/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/network-tools/_pluginconfig.yaml @@ -4,9 +4,10 @@ label: - allowed_teams: - openshift-staff-engineers allowed_users: + - danwinship - jcaamano - - trozet - - npinaeva + - kyrtapz + - tssurya label: backport-risk-assessed plugins: openshift/network-tools: diff --git a/core-services/prow/02_config/openshift/ovn-kubernetes/_pluginconfig.yaml b/core-services/prow/02_config/openshift/ovn-kubernetes/_pluginconfig.yaml index ebcb785101644..9278b3e0fdd5f 100644 --- a/core-services/prow/02_config/openshift/ovn-kubernetes/_pluginconfig.yaml +++ b/core-services/prow/02_config/openshift/ovn-kubernetes/_pluginconfig.yaml @@ -6,7 +6,6 @@ label: allowed_users: - jcaamano - kyrtapz - - martinkennelly - pperiyasamy - tssurya label: backport-risk-assessed