Merge pull request #5384 from IanColdwater/add-sig-security

add OWNERS, teams, and updates for SIG Security

10 files changed, 47 insertions, 24 deletions

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index ac279474..6f67a434 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -74,7 +74,7 @@ aliases:
     - Huang-Wei
     - ahg-g
   sig-security-leads:
-    - iancoldwater
+    - IanColdwater
     - tabbysable
   sig-service-catalog-leads:
     - jberkhahn
diff --git a/communication/slack-config/channels.yaml b/communication/slack-config/channels.yaml
index 93a78849..07add91f 100644
--- a/communication/slack-config/channels.yaml
+++ b/communication/slack-config/channels.yaml
@@ -345,9 +345,7 @@ channels:
   - name: sig-node-rkt
   - name: sig-scalability
   - name: sig-scheduling
-  - name: sig-security
-  - name: sig-security-docs
-  - name: sig-security-tooling
+  # sig-security* channels are defined in sig-security/
   - name: sig-service-catalog
   - name: sig-testing
   - name: sig-ui
diff --git a/communication/slack-config/restrictions.yaml b/communication/slack-config/restrictions.yaml
index 21b3c8cb..9299fb44 100755
--- a/communication/slack-config/restrictions.yaml
+++ b/communication/slack-config/restrictions.yaml
@@ -24,6 +24,9 @@ restrictions:
       - "^kubernetes-docs-[a-z]{2}(-maintainers)?$"
       - "^sig-docs$"
       - "^sig-docs-.*$"
+  - path: "sig-network/*.yaml"
+    channels:
+      - "^sig-network-.*$"
   - path: "sig-release/*.yaml"
     channels:
       - "^sig-release$"
@@ -32,9 +35,10 @@ restrictions:
       - "^sig-release-"
       - "^release-"
       - "^security-release-team$"
-  - path: "sig-network/*.yaml"
+  - path: "sig-security/*.yaml"
     channels:
-      - "^sig-network-.*$"
+      - "^sig-security$"
+      - "^sig-security-"
   - path: "sig-storage/*.yaml"
     channels:
       - "^sig-storage$"
diff --git a/communication/slack-config/sig-security/OWNERS b/communication/slack-config/sig-security/OWNERS
new file mode 100644
index 00000000..30af37be
--- /dev/null
+++ b/communication/slack-config/sig-security/OWNERS
@@ -0,0 +1,8 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+reviewers:
+  - sig-security-leads
+approvers:
+  - sig-security-leads
+labels:
+  - sig/security
diff --git a/communication/slack-config/sig-security/config.yaml b/communication/slack-config/sig-security/config.yaml
new file mode 100644
index 00000000..a56d99e0
--- /dev/null
+++ b/communication/slack-config/sig-security/config.yaml
@@ -0,0 +1,4 @@
+channels:
+  - name: sig-security
+  - name: sig-security-docs
+  - name: sig-security-tooling
diff --git a/communication/slack-config/users.yaml b/communication/slack-config/users.yaml
index 20f800b0..24693d0f 100644
--- a/communication/slack-config/users.yaml
+++ b/communication/slack-config/users.yaml
@@ -32,6 +32,7 @@ users:
   gsquared94: U0131C0PJBU
   hasheddan: ULLQEF30C
   hoegaarden: U7VA4RZS9
+  iancoldwater: U9VL5SZPX
   idealhack: U5NJ3DQM9
   idvoretskyi: U0CBHE6GM
   ilya-zuyev: U018UF2G42F
@@ -86,6 +87,7 @@ users:
   Sujay Pillai: UBW3N1VGW
   sumitranr: UCQN13L9H
   swamymsft: UHU7ZNXH8
+  tabbysable: U01742MGBRT
   tallclair: U64VCBURE
   TaoBeier: UCLDV6MN1
   tejal29: UACD7R316
diff --git a/sig-list.md b/sig-list.md
index 4c6e8e47..df475ad0 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -49,7 +49,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
 |[Release](sig-release/README.md)|release|* [Stephen Augustus](https://github.com/justaugustus), VMware<br>* [Sascha Grunert](https://github.com/saschagrunert), SUSE<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>
 |[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), Salesforce<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: [Mondays at 12:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/9934z1184192?pwd=L25Tc0ZOL3FqU09KNERlTU12dFhTQT09)<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: [Mondays at 12:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/9934z1184192?pwd=L25Tc0ZOL3FqU09KNERlTU12dFhTQT09)<br>
 |[Service Catalog](sig-service-catalog/README.md)|service-catalog|* [Jonathan Berkhahn](https://github.com/jberkhahn), IBM<br>* [Konstantin Semenov](https://github.com/jhvhs), VMware<br>|* [Slack](https://kubernetes.slack.com/messages/sig-service-catalog)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-service-catalog)|* Regular SIG Meeting: [Mondays at 13:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/7201225346)<br>
 |[Storage](sig-storage/README.md)|storage|* [Saad Ali](https://github.com/saad-ali), Google<br>* [Xing Yang](https://github.com/xing-yang), VMware<br>|* [Slack](https://kubernetes.slack.com/messages/sig-storage)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-storage)|* Regular SIG Meeting: [Thursdays at 9:00 PT (Pacific Time) (biweekly)](https://zoom.us/j/614261834)<br>
 |[Testing](sig-testing/README.md)|testing|* [Benjamin Elder](https://github.com/BenTheElder), Google<br>* [Aaron Crickenberger](https://github.com/spiffxp), Google<br>* [Steve Kuznetsov](https://github.com/stevekuznetsov), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/sig-testing)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-sig-testing)|* SIG Testing Bi-Weekly Meeting: [Tuesdays at 10:00 PT (Pacific Time) (bi-weekly starting Tuesday August 13, 2019)](https://zoom.us/j/135450138?pwd=WGJyaVZzekJCWFBTMGJGTXVjUFJaUT09)<br>* (testing-commons) Testing Commons: [Fridays at 13:00 PT (Pacific Time) (bi-weekly)](https://zoom.us/j/790505720?pwd=VThEeVJqTnFPY0o1bDFZQk1ZRjJLQT09)<br>
diff --git a/sig-security/OWNERS b/sig-security/OWNERS
new file mode 100644
index 00000000..30af37be
--- /dev/null
+++ b/sig-security/OWNERS
@@ -0,0 +1,8 @@
+# See the OWNERS docs at https://go.k8s.io/owners
+
+reviewers:
+  - sig-security-leads
+approvers:
+  - sig-security-leads
+labels:
+  - sig/security
diff --git a/sig-security/README.md b/sig-security/README.md
index 983886ca..030024ed 100644
--- a/sig-security/README.md
+++ b/sig-security/README.md
@@ -22,25 +22,25 @@ The [charter](charter.md) defines the scope and governance of the Security Speci
 ### Chairs
 The Chairs of the SIG run operations and processes governing the SIG.
 
-* Ian Coldwater (**[@iancoldwater](https://github.com/iancoldwater)**), Salesforce
+* Ian Coldwater (**[@IanColdwater](https://github.com/IanColdwater)**), Twilio
 * Tabitha Sable (**[@tabbysable](https://github.com/tabbysable)**), Datadog
 
 ## Contact
 - Slack: [#sig-security](https://kubernetes.slack.com/messages/sig-security)
 - [Mailing list](https://groups.google.com/forum/#!forum/kubernetes-sig-security)
 - [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/sig%2Fsecurity)
+- GitHub Teams:
+    - [@kubernetes/sig-security-leads](https://github.com/orgs/kubernetes/teams/sig-security-leads) - SIG Security Leads
+    - [@kubernetes/sig-security-pr-reviews](https://github.com/orgs/kubernetes/teams/sig-security-pr-reviews) - SIG Security PR review notifications
 
 ## Subprojects
 
 The following [subprojects][subproject-definition] are owned by sig-security:
-### community-discussion-groups
-Community Discussion Groups
-- **Owners:**
 ### security-audit
 Third Party Security Audit
 - **Owners:**
-### security-documents
-Security Documents and Documentation.
+### security-docs
+Security Documents and Documentation
 - **Owners:**
 
 [subproject-definition]: https://github.com/kubernetes/community/blob/master/governance.md#subprojects
diff --git a/sigs.yaml b/sigs.yaml
index 14362463..260b22a6 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -1997,9 +1997,9 @@ sigs:
   label: security
   leadership:
     chairs:
-    - github: iancoldwater
+    - github: IanColdwater
       name: Ian Coldwater
-      company: Salesforce
+      company: Twilio
     - github: tabbysable
       name: Tabitha Sable
       company: Datadog
@@ -2015,18 +2015,17 @@ sigs:
   contact:
     slack: sig-security
     mailing_list: https://groups.google.com/forum/#!forum/kubernetes-sig-security
+    teams:
+    - name: sig-security-leads
+      description: SIG Security Leads
+    - name: sig-security-pr-reviews
+      description: SIG Security PR review notifications
   subprojects:
-  - name: community-discussion-groups
-    description: |
-      Community Discussion Groups
-    owners: []
   - name: security-audit
-    description: |
-      Third Party Security Audit
+    description: Third Party Security Audit
     owners: []
-  - name: security-documents
-    description: |
-      Security Documents and Documentation.
+  - name: security-docs
+    description: Security Documents and Documentation
     owners: []
 - dir: sig-service-catalog
   name: Service Catalog