Merge pull request #5964 from justaugustus/sig-release

SIG Release cleanups

Author: k8s-ci-robot

OWNERS_ALIASES

@@ -60,7 +60,6 @@ aliases:
     - derekwaynecarr
   sig-release-leads:
     - cpanato
-    - hasheddan
     - jeremyrickard
     - justaugustus
     - puerco

communication/slack-config/sig-release/usergroups.yaml

@@ -2,8 +2,8 @@
 
 usergroups:
   # Should match the membership of the following teams at all times:
-  # - https://git.k8s.io/sig-release/release-managers.md#release-managers
-  # - https://git.k8s.io/sig-release/release-managers.md#associates
+  # - https://kubernetes.io/releases/release-managers/#release-managers
+  # - https://kubernetes.io/releases/release-managers/#release-managers-associates
   - name: release-managers
     long_name: Release Managers
     description: >-
@@ -16,7 +16,6 @@ usergroups:
     members:
       - ameukam # Release Manager Associate
       - cpanato # Release Manager
-      - hasheddan # subproject owner / Release Manager
       - jimangel # Release Manager Associate
       - justaugustus # subproject owner / Release Manager
       - mkorbi # Release Manager Associate
@@ -47,14 +46,14 @@ usergroups:
       - release-ci-signal
       - release-comms
       - release-docs
+      - release-enhancements
       - release-management
       - release-notes
       - sig-release
     members:
       - cpanato # SIG Release Technical Lead
-      - hasheddan # SIG Release Technical Lead
       - JamesLaverack # 1.23 Release Team Lead Shadow
-      - jeremyrickard # SIG Release Technical Lead /  1.23 Release Team EA
+      - jeremyrickard # SIG Release Technical Lead / 1.23 Release Team EA
       - jrsapi # 1.23 Release Team Lead Shadow
       - justaugustus # SIG Release Chair
       - LappleApple # SIG Release Program Manager
@@ -76,7 +75,6 @@ usergroups:
       - sig-release
     members:
       - cpanato # SIG Release Technical Lead
-      - hasheddan # SIG Release Technical Lead
       - jeremyrickard # SIG Release Technical Lead
       - justaugustus # SIG Release Chair
       - LappleApple # SIG Release Program Manager
@@ -85,7 +83,7 @@ usergroups:
 
   # Should match the membership of the following teams at all times:
   # - https://git.k8s.io/security/#product-security-committee-psc
-  # - https://git.k8s.io/sig-release/release-managers.md#release-managers
+  # - https://kubernetes.io/releases/release-managers/#release-managers
   - name: security-rel-team
     long_name: Security Release Team
     description: >-
@@ -97,7 +95,6 @@ usergroups:
     members:
       - cjcullen # Product Security Committee
       - cpanato # Release Manager
-      - hasheddan # subproject owner / Release Manager
       - joelsmith # Product Security Committee
       - justaugustus # subproject owner / Release Manager
       - lukehinds # Product Security Committee

contributors/devel/sig-release/cherry-picks.md

@@ -225,4 +225,4 @@ A note about the specific case in [#72860](https://github.com/kubernetes/kuberne
   unsupported
 
 [cherry-pick-script]: https://git.k8s.io/kubernetes/hack/cherry_pick_pull.sh
-[release-managers]: https://git.k8s.io/sig-release/release-managers.md
+[release-managers]: https://kubernetes.io/releases/release-managers/

contributors/devel/sig-release/kubernetes-versions.md

@@ -476,5 +476,5 @@ version marker, and more specifically, skew and upgrade jobs.
 (Fixed in https://github.com/kubernetes/test-infra/pull/15612.)
 
 
-[release-managers]: https://git.k8s.io/sig-release/release-managers.md
+[release-managers]: https://kubernetes.io/releases/release-managers/
 [test_config.yaml]: https://github.com/kubernetes/test-infra/blob/master/releng/test_config.yaml

contributors/devel/sig-release/release.md

@@ -348,6 +348,6 @@ issue kind labels must be set:
 [enhancements-freeze]: https://git.k8s.io/sig-release/releases/release_phases.md#enhancements-freeze
 [exceptions]: https://git.k8s.io/sig-release/releases/release_phases.md#exceptions
 [keps]: https://git.k8s.io/enhancements/keps
-[release-managers]: https://git.k8s.io/sig-release/release-managers.md
+[release-managers]: https://kubernetes.io/releases/release-managers/
 [release-team]: https://git.k8s.io/sig-release/release-team
 [sig-list]: /sig-list.md

sig-list.md

@@ -46,7 +46,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
 |[Multicluster](sig-multicluster/README.md)|multicluster|* [Jeremy Olmsted-Thompson](https://github.com/jeremyot), Google<br>* [Paul Morie](https://github.com/pmorie), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-multicluster)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-multicluster)|* Regular SIG Meeting: [Tuesdays at 9:30 PT (Pacific Time) (weekly)](https://zoom.us/my/k8s.mc)<br>
 |[Network](sig-network/README.md)|network|* [Casey Davenport](https://github.com/caseydavenport), Tigera<br>* [Dan Williams](https://github.com/dcbw), Red Hat<br>* [Tim Hockin](https://github.com/thockin), Google<br>|* [Slack](https://kubernetes.slack.com/messages/sig-network)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-network)|* Gateway API Meeting (APAC Friendly): [Mondays at 15:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/441530404)<br>* Gateway API Meeting (EMEA Friendly): [Tuesdays at 10:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/441530404)<br>* Network Policy API Meeting: [Mondays at 13:00 PT (Pacific Time) (weekly)](https://zoom.us/j/96264742248)<br>* SIG Network Ingress NGINX Meeting: [Tuesdays at 9:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/98377891310)<br>* SIG Network Kube Proxy Meeting: [Fridays at 8:30 PT (Pacific Time) (weekly)](https://docs.google.com/document/d/1yW3AUp5rYDLYCAtZc6e4zeLbP5HPLXdvuEFeVESOTic/edit)<br>* SIG Network Meeting: [Thursdays at 14:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/361123509)<br>
 |[Node](sig-node/README.md)|node|* [Dawn Chen](https://github.com/dchen1107), Google<br>* [Derek Carr](https://github.com/derekwaynecarr), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-node)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-node)|* Main SIG Meeting: [Tuesdays at 10:00 PT (Pacific Time) (weekly)](https://zoom.us/j/4799874685)<br>* Monthly Alternate Time CI/Triage Meeting: [second Thursdays at 08:00 PT (Pacific Time) (monthly)](https://zoom.us/j/4799874685)<br>* Weekly CI/Triage Meeting: [Wednesdays at 10:00 PT (Pacific Time) (weekly - excluding 2nd week of the month)](https://zoom.us/j/4799874685)<br>
-|[Release](sig-release/README.md)|release|* [Stephen Augustus](https://github.com/justaugustus), Cisco<br>* [Sascha Grunert](https://github.com/saschagrunert), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-release)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-release)|* Regular SIG Meeting: [Tuesdays at 14:30 UTC (biweekly)](https://zoom.us/j/327142148)<br>* (Release Engineering) Release Engineering: [Tuesdays at 14:30 UTC (biweekly)](https://zoom.us/j/240812475)<br>
+|[Release](sig-release/README.md)|release|* [Stephen Augustus](https://github.com/justaugustus), Cisco<br>* [Sascha Grunert](https://github.com/saschagrunert), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-release)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-release)|* Regular SIG Meeting: [Tuesdays at 14:30 UTC (biweekly)](https://zoom.us/j/327142148?pwd=RE9aZWtCc0hhOWs4ZTdXZ0hBM0ROdz09)<br>* (Release Engineering) Release Engineering: [Tuesdays at 14:30 UTC (biweekly)](https://zoom.us/j/240812475?pwd=bmhDQjN3N3dhV1dNSm9walJmTG5tUT09)<br>
 |[Scalability](sig-scalability/README.md)|scalability|* [Matt Matejczyk](https://github.com/mm4tt), Google<br>* [Shyam Jeedigunta](https://github.com/shyamjvs), AWS<br>|* [Slack](https://kubernetes.slack.com/messages/sig-scalability)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-scale)|* Regular SIG Meeting: [Thursdays at 10:30 PT (Pacific Time) (bi-weekly ([upcoming meeting dates](#upcoming-meeting-dates)))](https://zoom.us/j/94252896018?pwd=cTlMMlBoTHZqUEdjRm9VY2NWNUg5dz09)<br>
 |[Scheduling](sig-scheduling/README.md)|scheduling|* [Wei Huang](https://github.com/Huang-Wei), IBM<br>* [Abdullah Gharaibeh](https://github.com/ahg-g), Google<br>|* [Slack](https://kubernetes.slack.com/messages/sig-scheduling)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-scheduling)|* 10AM PT Meeting: [Thursdays at 17:00 UTC (biweekly starting Thursday June 7, 2018)](https://zoom.us/j/841218129)<br>
 |[Security](sig-security/README.md)|security|* [Ian Coldwater](https://github.com/IanColdwater), Twilio<br>* [Tabitha Sable](https://github.com/tabbysable), Datadog<br>|* [Slack](https://kubernetes.slack.com/messages/sig-security)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-security)|* Regular SIG Meeting: [Thursdays at 9:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/9934z1184192?pwd=L25Tc0ZOL3FqU09KNERlTU12dFhTQT09)<br>

sig-release/README.md

@@ -13,7 +13,7 @@ Ensure quality Kubernetes releases
 The [charter](charter.md) defines the scope and governance of the Release Special Interest Group.
 
 ## Meetings
-* Regular SIG Meeting: [Tuesdays at 14:30 UTC](https://zoom.us/j/327142148) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=14:30&tz=UTC).
+* Regular SIG Meeting: [Tuesdays at 14:30 UTC](https://zoom.us/j/327142148?pwd=RE9aZWtCc0hhOWs4ZTdXZ0hBM0ROdz09) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=14:30&tz=UTC).
   * [Meeting notes and Agenda](https://bit.ly/k8s-sig-release-meeting).
   * [Meeting recordings](https://bit.ly/k8s-sig-release-videos).
 
@@ -30,14 +30,14 @@ The Technical Leads of the SIG establish new subprojects, decommission existing
 subprojects, and resolve cross-subproject technical issues and decisions.
 
 * Carlos Tadeu Panato Jr. (**[@cpanato](https://github.com/cpanato)**), Mattermost
-* Daniel Mangum (**[@hasheddan](https://github.com/hasheddan)**), Upbound
 * Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Apple
 * Adolfo García Veytia (**[@puerco](https://github.com/puerco)**), uServers
 
 ## Emeritus Leads
 
 * Jorge Alarcon Ochoa (**[@alejandrox1](https://github.com/alejandrox1)**)
 * Caleb Miles (**[@calebamiles](https://github.com/calebamiles)**)
+* Daniel Mangum (**[@hasheddan](https://github.com/hasheddan)**)
 * Jaice Singer DuMars (**[@jdumars](https://github.com/jdumars)**)
 * Tim Pepper (**[@tpepper](https://github.com/tpepper)**)
 
@@ -46,10 +46,13 @@ subprojects, and resolve cross-subproject technical issues and decisions.
 - [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-release)
 - [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/sig%2Frelease)
 - GitHub Teams:
-    - [@kubernetes/kubernetes-milestone-maintainers](https://github.com/orgs/kubernetes/teams/kubernetes-milestone-maintainers) - Milestone Maintainers
-    - [@kubernetes/release-managers](https://github.com/orgs/kubernetes/teams/release-managers) - Release Managers
+    - [@kubernetes/milestone-maintainers](https://github.com/orgs/kubernetes/teams/milestone-maintainers) - [Milestone Maintainers](https://git.k8s.io/sig-release/release-team#milestone-maintainers)
+    - [@kubernetes/release-managers](https://github.com/orgs/kubernetes/teams/release-managers) - [Release Managers](https://kubernetes.io/releases/release-managers/)
+    - [@kubernetes/release-team](https://github.com/orgs/kubernetes/teams/release-team) - Members of the current Release Team and subproject owners
+    - [@kubernetes/release-team-leads](https://github.com/orgs/kubernetes/teams/release-team-leads) - Release Team Leads for the current Kubernetes release cycle
     - [@kubernetes/sig-release](https://github.com/orgs/kubernetes/teams/sig-release) - SIG Release Members
     - [@kubernetes/sig-release-admins](https://github.com/orgs/kubernetes/teams/sig-release-admins) - Admins for SIG Release repositories
+    - [@kubernetes/sig-release-leads](https://github.com/orgs/kubernetes/teams/sig-release-leads) - Chairs, Technical Leads, and Program Managers for SIG Release
 - Steering Committee Liaison: Davanum Srinivas (**[@dims](https://github.com/dims)**)
 
 ## Subprojects
@@ -71,7 +74,7 @@ The Release Engineering subproject is responsible for the [process/procedures](h
 - **Contact:**
   - Slack: [#release-management](https://kubernetes.slack.com/messages/release-management)
 - **Meetings:**
-  - Release Engineering: [Tuesdays at 14:30 UTC](https://zoom.us/j/240812475) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=14:30&tz=UTC).
+  - Release Engineering: [Tuesdays at 14:30 UTC](https://zoom.us/j/240812475?pwd=bmhDQjN3N3dhV1dNSm9walJmTG5tUT09) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=14:30&tz=UTC).
     - [Meeting notes and Agenda](https://bit.ly/k8s-releng-meeting).
     - [Meeting recordings](https://bit.ly/k8s-sig-release-videos).
 ### Release Team
@@ -93,6 +96,6 @@ and kubernetes/test-infra.
 <!-- BEGIN CUSTOM CONTENT -->
 ---
 
-_The canonical location for SIG Release information is [k/sig-release](https://github.com/kubernetes/sig-release)._
+_The canonical location for SIG Release information is [kubernetes/sig-release](https://github.com/kubernetes/sig-release)._
 
 <!-- END CUSTOM CONTENT -->

sigs.yaml

@@ -1865,9 +1865,6 @@ sigs:
     - github: cpanato
       name: Carlos Tadeu Panato Jr.
       company: Mattermost
-    - github: hasheddan
-      name: Daniel Mangum
-      company: Upbound
     - github: jeremyrickard
       name: Jeremy Rickard
       company: Apple
@@ -1879,6 +1876,8 @@ sigs:
       name: Jorge Alarcon Ochoa
     - github: calebamiles
       name: Caleb Miles
+    - github: hasheddan
+      name: Daniel Mangum
     - github: jdumars
       name: Jaice Singer DuMars
     - github: tpepper
@@ -1889,21 +1888,27 @@ sigs:
     time: "14:30"
     tz: UTC
     frequency: biweekly
-    url: https://zoom.us/j/327142148
+    url: https://zoom.us/j/327142148?pwd=RE9aZWtCc0hhOWs4ZTdXZ0hBM0ROdz09
     archive_url: https://bit.ly/k8s-sig-release-meeting
     recordings_url: https://bit.ly/k8s-sig-release-videos
   contact:
     slack: sig-release
     mailing_list: https://groups.google.com/forum/#!forum/kubernetes-sig-release
     teams:
-    - name: kubernetes-milestone-maintainers
-      description: Milestone Maintainers
+    - name: milestone-maintainers
+      description: '[Milestone Maintainers](https://git.k8s.io/sig-release/release-team#milestone-maintainers)'
     - name: release-managers
-      description: Release Managers
+      description: '[Release Managers](https://kubernetes.io/releases/release-managers/)'
+    - name: release-team
+      description: Members of the current Release Team and subproject owners
+    - name: release-team-leads
+      description: Release Team Leads for the current Kubernetes release cycle
     - name: sig-release
       description: SIG Release Members
     - name: sig-release-admins
       description: Admins for SIG Release repositories
+    - name: sig-release-leads
+      description: Chairs, Technical Leads, and Program Managers for SIG Release
     liaison:
       github: dims
       name: Davanum Srinivas
@@ -1930,7 +1935,7 @@ sigs:
       time: "14:30"
       tz: UTC
       frequency: biweekly
-      url: https://zoom.us/j/240812475
+      url: https://zoom.us/j/240812475?pwd=bmhDQjN3N3dhV1dNSm9walJmTG5tUT09
       archive_url: https://bit.ly/k8s-releng-meeting
       recordings_url: https://bit.ly/k8s-sig-release-videos
   - name: Release Team