From e3248d90a868849ce2f949a3725f1f3edd1966c1 Mon Sep 17 00:00:00 2001 From: Simon Waight Date: Tue, 29 Oct 2024 17:20:14 +1100 Subject: [PATCH 1/2] Remove unused probot automations; Update GitOps config for stale issues. --- .github/lock.yaml | 21 ------- .github/move.yml | 33 ---------- .github/policies/resourceManagement.yml | 80 ++++++++++++++++--------- .github/stale.yml | 66 -------------------- 4 files changed, 52 insertions(+), 148 deletions(-) delete mode 100644 .github/lock.yaml delete mode 100644 .github/move.yml delete mode 100755 .github/stale.yml diff --git a/.github/lock.yaml b/.github/lock.yaml deleted file mode 100644 index 72669b63..00000000 --- a/.github/lock.yaml +++ /dev/null @@ -1,21 +0,0 @@ -# Number of days of inactivity before a closed issue or pull request is locked -daysUntilLock: 365 - -# Skip issues and pull requests created before a given timestamp. Timestamp must -# follow ISO 8601 (`YYYY-MM-DD`). Set to `false` to disable -skipCreatedBefore: false - -# Issues and pull requests with these labels will be ignored. Set to `[]` to disable -exemptLabels: [] - -# Label to add before locking, such as `outdated`. Set to `false` to disable -lockLabel: true - -# Comment to post before locking. Set to `false` to disable -lockComment: > - This thread has been automatically locked since there has not been - any recent activity after it was closed. Please open a new issue for - related bugs. - -# Assign `resolved` as the reason for locking. Set to `false` to disable -setLockReason: false diff --git a/.github/move.yml b/.github/move.yml deleted file mode 100644 index e206e720..00000000 --- a/.github/move.yml +++ /dev/null @@ -1,33 +0,0 @@ -# Configuration for Move Issues - https://github.com/dessant/move-issues - -# Delete the command comment when it contains no other content -deleteCommand: true - -# Close the source issue after moving -closeSourceIssue: true - -# Lock the source issue after moving -lockSourceIssue: false - -# Mention issue and comment authors -mentionAuthors: true - -# Preserve mentions in the issue content -keepContentMentions: false - -# Move labels that also exist on the target repository -moveLabels: true - -# Set custom aliases for targets -aliases: - r: engine - or: Azure/aks-engine - r: vk - or: virtual-kubelet/virtual-kubelet - r: cli - or: Azure/azure-cli - r: preview - or: Azure/azure-cli-extensions - -# Repository to extend settings from -# _extends: repo diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index 9245c0f3..8cc5c060 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -8,7 +8,7 @@ where: configuration: resourceManagementConfiguration: scheduledSearches: - - description: + - description: Close stale issues - 7 days inactivity frequencies: - hourly: hour: 6 @@ -23,13 +23,14 @@ configuration: - closeIssue - addReply: reply: This issue will now be closed because it hasn't had any activity for 7 days after stale. ${issueAuthor} feel free to comment again on the next 7 days to reopen or open a new issue after that time if you still have a question/issue or suggestion. - - description: + - description: Mark issues stale that are not assigned to anyone and are not labeled with selected labels - 21 days inactivity frequencies: - hourly: hour: 6 filters: - isIssue - isOpen + - isNotAssigned - noActivitySince: days: 21 - isNotLabeledWith: @@ -38,12 +39,18 @@ configuration: label: feature-request - isNotLabeledWith: label: bug + - isNotLabeledWith: + label: enhancement + - isNotLabeledWith: + label: announcement + - isNotLabeledWith: + label: under-investigation actions: - addLabel: label: stale - addReply: - reply: This issue has been automatically marked as stale because it has not had any activity for **21 days**. It will be closed if no further activity occurs **within 7 days of this comment**. - - description: + reply: This unassigned issue has been automatically marked as stale because it has not had any activity for **21 days**. It will be closed if no further activity occurs **within 7 days of this comment**. + - description: Close issues marked as duplicates - daily frequencies: - hourly: hour: 6 @@ -58,7 +65,7 @@ configuration: - addReply: reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes. - closeIssue - - description: + - description: Mark as needing attention (general) - 5 days frequencies: - daily: time: 9:0 @@ -86,7 +93,7 @@ configuration: reply: Action required from @aritraghosh, @julia-yin, @AllenWen-at-Azure - addLabel: label: 'Needs Attention :wave:' - - description: + - description: Issues marked as triage with no activity for 2 days - notify AKS PM frequencies: - hourly: hour: 6 @@ -103,7 +110,7 @@ configuration: label: action-required - addReply: reply: Triage required from @Azure/aks-pm ${assignees} - - description: + - description: Notify AKS Leads for attention - 15 days frequencies: - hourly: hour: 6 @@ -120,7 +127,7 @@ configuration: actions: - addReply: reply: Issue needing attention of @Azure/aks-leads - - description: + - description: Notify AKS PM for labelling - weekly frequencies: - weekday: day: Wednesday @@ -132,7 +139,7 @@ configuration: actions: - addReply: reply: '@Azure/aks-pm issue needs labels' - - description: + - description: Add action-required label to issues needing attention - 25 days inactivity frequencies: - hourly: hour: 6 @@ -167,7 +174,7 @@ configuration: actions: - addLabel: label: action-required - - description: + - description: Add action-required label to feature-request issues - 180 days inactivity frequencies: - hourly: hour: 6 @@ -180,7 +187,7 @@ configuration: actions: - addLabel: label: action-required - - description: + - description: Mark as stale open "Needs Information" issues - 7 days inactivity frequencies: - daily: time: 1:0 @@ -193,7 +200,7 @@ configuration: actions: - addLabel: label: stale - - description: + - description: Mark as stale open "Needs Author Feedback" issues - 7 days inactivity frequencies: - daily: time: 1:0 @@ -206,7 +213,7 @@ configuration: actions: - addLabel: label: stale - - description: + - description: Close issues marked as "Answer Provided" - 2 days inactivity frequencies: - hourly: hour: 6 @@ -220,7 +227,7 @@ configuration: - addReply: reply: Thanks for reaching out. I'm closing this issue as it was marked with "Answer Provided" and it hasn't had activity for 2 days. - closeIssue - - description: + - description: Close issues marked as "Fix Released" - 7 days inactivity frequencies: - hourly: hour: 12 @@ -234,7 +241,7 @@ configuration: - addReply: reply: Thanks for reaching out. I'm closing this issue as it was marked with "Fix released" and it hasn't had activity for 7 days. - closeIssue - - description: + - description: Mark issues labeled with "Support Request" as stale - 7 days inactivity frequencies: - hourly: hour: 6 @@ -255,8 +262,8 @@ configuration: label: stale - addReply: reply: Case being worked with Microsoft Support, adding stale label for automatic closure if not other reports are added. - - description: - frequencies: + - description: Close issues marked as "Shipped" - 7 days inactivity + frequencies: - hourly: hour: 12 filters: @@ -269,7 +276,7 @@ configuration: - addReply: reply: Thank you for the feature request. I'm closing this issue as this feature has shipped and it hasn't had activity for 7 days. - closeIssue - - description: + - description: Daily - Close issues marked as "Other Resolution" - 3 days inactivity frequencies: - hourly: hour: 12 @@ -303,7 +310,7 @@ configuration: label: Needs Author Feedback - removeLabel: label: Needs Information - description: + description: When a comment is added to an open issue by the issue author, add the action-required label and remove the Needs Information and Needs Author Feedback labels. - if: - payloadType: Issues - not: @@ -317,7 +324,7 @@ configuration: then: - removeLabel: label: stale - description: + description: When a stale issue has any activity (other than closing) remove the stale label. - if: - payloadType: Issue_Comment - hasLabel: @@ -325,7 +332,7 @@ configuration: then: - removeLabel: label: stale - description: + description: When a stale issue has a comment, remove the stale label. - if: - payloadType: Issues - labelAdded: @@ -344,7 +351,7 @@ configuration: Thank you! - description: + description: When an issue is labeled with SR-Support Request, add a reply with instructions on how to create a support ticket. - if: - or: - payloadType: Issues @@ -485,6 +492,23 @@ configuration: - mentionUsers: mentionees: - chasewilson + - paulgmiller + - quantumn-a5 + replyTemplate: ${mentionees} would you be able to assist? + assignMentionees: True + - if: + - hasLabel: + label: Cilium + - not: + isAssignedToSomeone + then: + - mentionUsers: + mentionees: + - chasewilson + - paulgmiller + - wedaly + - quantumn-a5 + - tamilmani1989 replyTemplate: ${mentionees} would you be able to assist? assignMentionees: True - if: @@ -810,7 +834,7 @@ configuration: - seguler replyTemplate: ${mentionees} would you be able to assist? assignMentionees: True - description: + description: When certain lables are added to an issue, mention the appropriate team members to assist. - if: - payloadType: Issues - isAssignedToSomeone @@ -825,7 +849,7 @@ configuration: then: - addReply: reply: Action required from ${assignees}. - description: + description: If an issue is assigned and has the action-required label, mention the assignee. - if: - payloadType: Issues - isOpen @@ -858,7 +882,7 @@ configuration: label: action-required - removeLabel: label: 'Needs Attention :wave:' - description: + description: Any activity on an issue will remove the action-required and Needs Attention labels if they are present. - if: - payloadType: Issue_Comment - isOpen @@ -898,7 +922,7 @@ configuration: then: - addLabel: label: resolution/shipped - description: + description: When a comment is added to an open issue without the bug label and the comment contains "Released/Shipped/Fixed on release", add the resolution/shipped label. - if: - payloadType: Issue_Comment - isOpen @@ -910,6 +934,6 @@ configuration: then: - addLabel: label: resolution/fix-released - description: + description: When a comment is added to an open issue with the bug label and the comment contains "Released/Shipped/Fixed on release", add the resolution/fix-released label. onFailure: -onSuccess: +onSuccess: \ No newline at end of file diff --git a/.github/stale.yml b/.github/stale.yml deleted file mode 100755 index b15ff898..00000000 --- a/.github/stale.yml +++ /dev/null @@ -1,66 +0,0 @@ -# Configuration for probot-stale - https://github.com/probot/stale - -# Number of days of inactivity before an Issue or Pull Request becomes stale -daysUntilStale: 90 - -# Number of days of inactivity before an Issue or Pull Request with the stale label is closed. -# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale. -daysUntilClose: 30 - -# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled) -onlyLabels: [] - -# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable -exemptLabels: - - pinned - - security - - feature - - roadmap - - enhancement - - feature-request - - bug - - triage - -# Set to true to ignore issues in a project (defaults to false) -exemptProjects: true - -# Set to true to ignore issues in a milestone (defaults to false) -exemptMilestones: false - -# Set to true to ignore issues with an assignee (defaults to false) -exemptAssignees: false - -# Label to use when marking as stale -staleLabel: stale - -# Comment to post when marking as stale. Set to `false` to disable -markComment: > - This issue has been automatically marked as stale because it has not had - activity in 90 days. It will be closed if no further activity occurs. Thank - you! - -# Comment to post when removing the stale label. -unmarkComment: > - Issue still active. - -# Comment to post when closing a stale Issue or Pull Request. -closeComment: > - This issue has been stale for 30 days without any activity. It will now be closed. If you have any issues or suggestions please feel free to open a new issue. - -# Limit the number of actions per hour, from 1-30. Default is 30 -limitPerRun: 30 - -# Limit to only `issues` or `pulls` -only: issues - -# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls': -# pulls: -# daysUntilStale: 30 -# markComment: > -# This pull request has been automatically marked as stale because it has not had -# recent activity. It will be closed if no further activity occurs. Thank you -# for your contributions. - -# issues: -# exemptLabels: -# - confirmed From 73f29ed88170f31db0f2aed5c5eec86153ea9695 Mon Sep 17 00:00:00 2001 From: Simon Waight Date: Tue, 29 Oct 2024 17:31:37 +1100 Subject: [PATCH 2/2] Addedmchange from Aritra's PR --- .github/policies/resourceManagement.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index 8cc5c060..595169a3 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -255,6 +255,8 @@ configuration: days: 7 - isNotLabeledWith: label: feature-request + - isNotLabeledWith: + label: enhancement - isNotLabeledWith: label: stale actions: