diff --git a/cluster/ci/config/prow/config.yaml b/cluster/ci/config/prow/config.yaml index c8e8d1a13cd28..d6cf98f9b24be 100644 --- a/cluster/ci/config/prow/config.yaml +++ b/cluster/ci/config/prow/config.yaml @@ -205,6 +205,7 @@ tide: - lgtm - approved - bugzilla/valid-bug + - cherry-pick-approved missingLabels: - needs-rebase - do-not-merge/blocked-paths @@ -234,6 +235,7 @@ tide: labels: - lgtm - bugzilla/valid-bug + - cherry-pick-approved missingLabels: - needs-rebase - do-not-merge/blocked-paths diff --git a/cluster/ci/config/prow/labels.yaml b/cluster/ci/config/prow/labels.yaml index 8ef7451d7be05..f071f2a2494d5 100644 --- a/cluster/ci/config/prow/labels.yaml +++ b/cluster/ci/config/prow/labels.yaml @@ -87,6 +87,11 @@ default: target: prs addedBy: prow prowPlugin: cherrypickunapproved + - color: fef2c0 + description: Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. # Consumed by the kubernetes/kubernetes cherry-pick-queue. + name: cherry-pick-approved + target: prs + addedBy: humans - color: e11d21 description: Indicates that a PR should not merge because someone has issued a /hold command. name: do-not-merge/hold