Merge pull request #4722 from justaugustus/sig-pm-retirement

SIG PM Retirement + Enhancements subproject transfer to SIG Arch

12 files changed, 53 insertions, 69 deletions

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 46b35a87..e92585e7 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -59,11 +59,6 @@ aliases:
   sig-node-leads:
     - dchen1107
     - derekwaynecarr
-  sig-pm-leads:
-    - calebamiles
-    - jdumars
-    - justaugustus
-    - lachie83
   sig-release-leads:
     - calebamiles
     - justaugustus
diff --git a/sig-pm/OWNERS b/archive/sig-pm/OWNERS
index bed41ec7..bed41ec7 100644
--- a/sig-pm/OWNERS
+++ b/archive/sig-pm/OWNERS
diff --git a/sig-pm/README.md b/archive/sig-pm/README.md
index 8c68f336..8c68f336 100644
--- a/sig-pm/README.md
+++ b/archive/sig-pm/README.md
diff --git a/communication/slack-config/channels.yaml b/communication/slack-config/channels.yaml
index 83f37b84..7713093f 100644
--- a/communication/slack-config/channels.yaml
+++ b/communication/slack-config/channels.yaml
@@ -116,8 +116,6 @@ channels:
   - name: jsonnet
   - name: k14s
   - name: kaniko
-  - name: k8s-code-organization
-  - name: k8s-conformance
   - name: k8s-dual-stack
   - name: k8s-infra-alerts
   - name: k8s-release
@@ -256,7 +254,6 @@ channels:
   - name: pharmer
   - name: pl-users
   - name: pr-reviews
-  - name: prod-readiness
   - name: prometheus
   - name: prometheus-operator
   - name: prow
@@ -278,7 +275,6 @@ channels:
   - name: shoutouts
   - name: sig-api-machinery
   - name: sig-apps
-  - name: sig-architecture
   - name: sig-auth
   - name: sig-autoscaling
   - name: sig-cli
@@ -304,7 +300,6 @@ channels:
   - name: sig-network
   - name: sig-node
   - name: sig-node-rkt
-  - name: sig-pm
   - name: sig-scalability
   - name: sig-scheduling
   - name: sig-service-catalog
diff --git a/communication/slack-config/restrictions.yaml b/communication/slack-config/restrictions.yaml
index 6964c6f2..b2598e2e 100644
--- a/communication/slack-config/restrictions.yaml
+++ b/communication/slack-config/restrictions.yaml
@@ -10,6 +10,15 @@ restrictions:
       - ".*"
   - path: template.yaml
     template: true
+  - path: "sig-architecture/*.yaml"
+    channels:
+      - "^sig-architecture$"
+      - "^enhancements$"
+      - "^k8s-code-organization$"
+      - "^k8s-conformance$"
+      - "^prod-readiness$"
+    usergroups:
+      - "^enhancements-owners$"
   - path: "sig-docs/*.yaml"
     channels:
       - "^kubernetes-docs-[a-z]{2}$"
diff --git a/communication/slack-config/sig-architecture/OWNERS b/communication/slack-config/sig-architecture/OWNERS
new file mode 100644
index 00000000..b8c3d461
--- /dev/null
+++ b/communication/slack-config/sig-architecture/OWNERS
@@ -0,0 +1,8 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+reviewers:
+  - sig-architecture-leads
+approvers:
+  - sig-architecture-leads
+labels:
+  - sig/architecture
diff --git a/communication/slack-config/sig-architecture/config.yaml b/communication/slack-config/sig-architecture/config.yaml
new file mode 100644
index 00000000..2d157772
--- /dev/null
+++ b/communication/slack-config/sig-architecture/config.yaml
@@ -0,0 +1,7 @@
+channels:
+  - name: sig-architecture
+  - name: enhancements
+    id: C1L57L91V
+  - name: k8s-code-organization
+  - name: k8s-conformance
+  - name: prod-readiness
diff --git a/communication/slack-config/sig-architecture/usergroups.yaml b/communication/slack-config/sig-architecture/usergroups.yaml
new file mode 100644
index 00000000..4be1a7f7
--- /dev/null
+++ b/communication/slack-config/sig-architecture/usergroups.yaml
@@ -0,0 +1,15 @@
+# This file contains a list of all Slack User Groups that are managed by SIG Architecture.
+
+usergroups:
+  - name: enhancements-owners
+    long_name: Enhancements Owners
+    description: Process owners for the Enhancements subproject.
+    channels:
+      - enhancements
+      - sig-architecture
+      - sig-release
+    members:
+      - jeremyrickard # subproject owner
+      - johnbelamaric # subproject owner
+      - justaugustus # subproject owner
+      - mrbobbytables # subproject owner
diff --git a/communication/slack-config/users.yaml b/communication/slack-config/users.yaml
index 0ad10293..473c743d 100644
--- a/communication/slack-config/users.yaml
+++ b/communication/slack-config/users.yaml
@@ -18,6 +18,8 @@ users:
   idvoretskyi: U0CBHE6GM
   jdumars: U0YJS6LHL
   jeefy: U5MCFK468
+  jeremyrickard: U72ESU398
+  johnbelamaric: U246A1A0N
   jonasrosland: U0A4G34S2
   justaugustus: U0E0E78AK
   katharine: UBTBNJ6GL
diff --git a/sig-architecture/README.md b/sig-architecture/README.md
index 3a2f2d62..632fd220 100644
--- a/sig-architecture/README.md
+++ b/sig-architecture/README.md
@@ -75,6 +75,12 @@ The following [subprojects][subproject-definition] are owned by sig-architecture
   - Slack: [#k8s-conformance](https://kubernetes.slack.com/messages/k8s-conformance)
   - GitHub Teams:
     - [@kubernetes/cncf-conformance-wg](https://github.com/orgs/kubernetes/teams/cncf-conformance-wg)
+### enhancements
+[Described below](#enhancements)
+- **Owners:**
+  - https://raw.githubusercontent.com/kubernetes/enhancements/master/OWNERS
+- **Contact:**
+  - Slack: [#enhancements](https://kubernetes.slack.com/messages/enhancements)
 ### production-readiness
 [Described below](#production-readiness)
 - **Owners:**
diff --git a/sig-list.md b/sig-list.md
index 0b252683..2d901b45 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -36,7 +36,6 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
 |[Multicluster](sig-multicluster/README.md)|multicluster|* [Paul Morie](https://github.com/pmorie), Red Hat<br>* [Quinton Hoole](https://github.com/quinton-hoole), Huawei<br>|* [Slack](https://kubernetes.slack.com/messages/sig-multicluster)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-multicluster)|* Cluster Federation (KubeFed) Working Group: [Wednesdays at 7:30 PT (Pacific Time) (weekly)](https://zoom.us/my/k8s.mc)<br>* Regular SIG Meeting: [Tuesdays at 9:30 PT (Pacific Time) (biweekly)](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)|* SIG Network Meeting: [Thursdays at 14:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/361123509)<br>* Service APIs Meeting (APAC Friendly Time): [Thursdays at 16:30 PT (Pacific Time) (biweekly)](https://zoom.us/j/441530404)<br>* Service APIs Meeting (EMEA Friendly Time): [Thursdays at 10:30 PT (Pacific Time) (biweekly)](https://zoom.us/j/140577552)<br>* Service APIs Office Hours: [Wednesdays at 15:00 PT (Pacific Time) (weekly)](https://zoom.us/j/289465529)<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)|* Regular SIG Meeting: [Tuesdays at 10:00 PT (Pacific Time) (weekly)](https://zoom.us/j/4799874685)<br>
-|[PM](sig-pm/README.md)|pm|* [Caleb Miles](https://github.com/calebamiles), Google<br>* [Jaice Singer DuMars](https://github.com/jdumars), Google<br>* [Stephen Augustus](https://github.com/justaugustus), VMware<br>* [Lachie Evenson](https://github.com/lachie83), Microsoft<br>|* [Slack](https://kubernetes.slack.com/messages/sig-pm)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-pm)|* Regular SIG Meeting: [Tuesdays at 18:30 UTC (biweekly)](https://zoom.us/j/577372069)<br>
 |[Release](sig-release/README.md)|release|* [Caleb Miles](https://github.com/calebamiles), Google<br>* [Stephen Augustus](https://github.com/justaugustus), VMware<br>* [Tim Pepper](https://github.com/tpepper), VMware<br>|* [Slack](https://kubernetes.slack.com/messages/sig-release)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-release)|* Regular SIG Meeting: [Mondays at 15:00 UTC (biweekly)](https://zoom.us/j/327142148)<br>* (release-engineering) Regular SIG Meeting: [Mondays at 15:00 UTC (biweekly)](https://zoom.us/j/240812475)<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 17:30 UTC (weekly/bi-weekly as per demand ([upcoming meeting dates](#upcoming-meeting-dates)))](https://zoom.us/j/989573207)<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>* 5PM PT Meeting: [Thursdays at 24:00 UTC (biweekly starting Thursday June 14, 2018)](https://zoom.us/j/350635606)<br>
diff --git a/sigs.yaml b/sigs.yaml
index 7a151a89..d1a2c20a 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -325,6 +325,12 @@ sigs:
     owners:
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/test/conformance/OWNERS
     - https://raw.githubusercontent.com/kubernetes/kubernetes/master/test/conformance/testdata/OWNERS
+  - name: enhancements
+    description: '[Described below](#enhancements)'
+    contact:
+      slack: enhancements
+    owners:
+    - https://raw.githubusercontent.com/kubernetes/enhancements/master/OWNERS
   - name: production-readiness
     description: '[Described below](#production-readiness)'
     contact:
@@ -1657,64 +1663,6 @@ sigs:
       slack: node-problem-detector
     owners:
     - https://raw.githubusercontent.com/kubernetes/node-problem-detector/master/OWNERS
-- dir: sig-pm
-  name: PM
-  mission_statement: >
-    Focuses on aspects of product management, such as the qualification and successful
-    management of user requests, and aspects of project and program management such
-    as the continued improvement of the processes used by the Kubernetes community
-    to maintain the Kubernetes Project itself.
-
-    Besides helping to discover both what to build and how to build it, the PM Group
-    also helps to try and keep the wheels on this spaceship we are all building together;
-    bringing together people who think about Kubernetes as both a vibrant community
-    of humans and technical program is another primary focus of this group.
-
-    Members of the Kubernetes PM Group can assume certain additional responsibilities
-    to help maintain the Kubernetes Project itself.
-
-    It is also important to remember that the role of managing an open source project
-    is very new and largely unscoped for a project as large as Kubernetes; we are
-    learning too and we are excited to learn how we can best serve the community of
-    users and contributors.
-
-  charter_link: charter.md
-  label: pm
-  leadership:
-    chairs:
-    - github: calebamiles
-      name: Caleb Miles
-      company: Google
-    - github: jdumars
-      name: Jaice Singer DuMars
-      company: Google
-    - github: justaugustus
-      name: Stephen Augustus
-      company: VMware
-    - github: lachie83
-      name: Lachie Evenson
-      company: Microsoft
-    emeritus_leads:
-    - github: apsinha
-      name: Aparna Sinha
-    - github: idvoretskyi
-      name: Ihor Dvoretskyi
-  meetings:
-  - description: Regular SIG Meeting
-    day: Tuesday
-    time: "18:30"
-    tz: UTC
-    frequency: biweekly
-    url: https://zoom.us/j/577372069
-    archive_url: https://docs.google.com/document/d/13uHgcLf-hcR4a5QbV888fhnVsF3djBEpN8HolwS0kWM/edit?usp=sharing
-    recordings_url: https://www.youtube.com/watch?v=VcdjaZAol2I&list=PL69nYSiGNLP3EBqpUGVsK1sMgUZVomfEQ
-  contact:
-    slack: sig-pm
-    mailing_list: https://groups.google.com/forum/#!forum/kubernetes-sig-pm
-  subprojects:
-  - name: enhancements
-    owners:
-    - https://raw.githubusercontent.com/kubernetes/enhancements/master/OWNERS
 - dir: sig-release
   name: Release
   mission_statement: >