Add Code of Conduct Committee to sigs.yaml

5 files changed, 73 insertions, 9 deletions

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 36c5491c..4add1747 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -157,6 +157,12 @@ aliases:
     - joelsmith
     - cji
     - jaybeale
+  committee-code-of-conduct:
+    - jdumars
+    - parispittman
+    - carolynvs
+    - eparis
+    - bradamant3
   committee-steering:
     - bgrant0607
     - brendanburns
@@ -171,12 +177,6 @@ aliases:
     - spiffxp
     - timothysc
 ## BEGIN CUSTOM CONTENT
-  code-of-conduct-committee:
-    - jdumars
-    - parispittman
-    - eparis
-    - carolynvs
-    - bradamant3
   product-security-committee:
     - philips
     - jessfraz
diff --git a/committee-code-of-conduct/OWNERS b/committee-code-of-conduct/OWNERS
index 4db02842..1e7cf443 100644
--- a/committee-code-of-conduct/OWNERS
+++ b/committee-code-of-conduct/OWNERS
@@ -1,8 +1,8 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 reviewers:
-  - code-of-conduct-committee
+  - committee-code-of-conduct
 approvers:
-  - code-of-conduct-committee
+  - committee-code-of-conduct
 labels:
   - committee/conduct
diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md
index 7f6902d5..fe0f44e0 100644
--- a/committee-code-of-conduct/README.md
+++ b/committee-code-of-conduct/README.md
@@ -1,7 +1,40 @@
-# Kubernetes Code of Conduct Committee (CoCC)
+<!---
+This is an autogenerated file!
+
+Please do not edit this file directly, but instead make changes to the
+sigs.yaml file in the project root.
+
+To understand how this file is generated, see https://git.k8s.io/community/generator/README.md
+--->
+# Code of Conduct Committee
 
 The Kubernetes Code of Conduct Committee (CoCC) is the body that is responsible for enforcing and maintaining the Kubernetes Code of Conduct.
 
+
+## Members
+
+* Jaice Singer Dumars (**[@jdumars](https://github.com/jdumars)**), Google
+* Paris Pittman (**[@parispittman](https://github.com/parispittman)**), Google
+* Carolyn Van Slyck (**[@carolynvs](https://github.com/carolynvs)**), Microsoft
+* Eric Paris (**[@eparis](https://github.com/eparis)**), Red Hat
+* Jennifer Rondeau (**[@bradamant3](https://github.com/bradamant3)**), VMware
+
+## Contact
+* Private Mailing List: conduct@kubernetes.io
+* [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/ug%2Fconduct)
+
+## GitHub Teams
+
+The below teams can be mentioned on issues and PRs in order to get attention from the right people.
+Note that the links to display team membership will only work if you are a member of the org.
+
+| Team Name | Details | Description |
+| --------- |:-------:| ----------- |
+| @kubernetes/code-of-conduct-committee | [link](https://github.com/orgs/kubernetes/teams/code-of-conduct-committee) | General Discussion |
+
+<!-- BEGIN CUSTOM CONTENT -->
+## Terms
+
 The members and their terms are as follows:
 - Jaice Singer Dumars (Google) - 2 years
 - Paris Pittman (Google) - 2 years
@@ -12,3 +45,4 @@ The members and their terms are as follows:
 Please see the [bootstrapping document](./bootstrapping-process.md) for more information on how members are picked, their responsibilities, and how the committee will initially function.
 
 _More information on how to contact this committee and learn about its process to come in the near future. For now, any Code of Conduct or Code of Conduct Committee concerns can be directed to <conduct@kubernetes.io>_.
+<!-- END CUSTOM CONTENT -->
diff --git a/sig-list.md b/sig-list.md
index d3e1edbe..7978c0f8 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -72,6 +72,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
 
 | Name |  Label | Members | Contact |
 |------|--------|---------|---------|
+|[Code of Conduct](committee-code-of-conduct/README.md)|conduct|* [Jaice Singer Dumars](https://github.com/jdumars), Google<br>* [Paris Pittman](https://github.com/parispittman), Google<br>* [Carolyn Van Slyck](https://github.com/carolynvs), Microsoft<br>* [Eric Paris](https://github.com/eparis), Red Hat<br>* [Jennifer Rondeau](https://github.com/bradamant3), VMware<br>|* [Private Mailing List](conduct@kubernetes.io)
 |[Steering](committee-steering/README.md)|steering|* [Brian Grant](https://github.com/bgrant0607), Google<br>* [Brendan Burns](https://github.com/brendanburns), Microsoft<br>* [Derek Carr](https://github.com/derekwaynecarr), Red Hat<br>* [Davanum Srinivas](https://github.com/dims), Huawei<br>* [Joe Beda](https://github.com/jbeda), VMware<br>* [Michelle Noorali](https://github.com/michelleN), Microsoft<br>* [Brandon Philips](https://github.com/philips), Red Hat<br>* [Phillip Wittrock](https://github.com/pwittrock), Google<br>* [Sarah Novotny](https://github.com/sarahnovotny), Google<br>* [Clayton Coleman](https://github.com/smarterclayton), Red Hat<br>* [Aaron Crickenberger](https://github.com/spiffxp), Google<br>* [Timothy St. Clair](https://github.com/timothysc), VMware<br>|* [Mailing List](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering)<br>* [Private Mailing List](steering-private@kubernetes.io)
 <!-- BEGIN CUSTOM CONTENT -->
 
diff --git a/sigs.yaml b/sigs.yaml
index e9078319..090b2ea1 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -2553,3 +2553,32 @@ committees:
       teams:
       - name: steering-committee
         description: General Discussion
+  - name: Code of Conduct
+    dir: committee-code-of-conduct
+    mission_statement: >
+      The Kubernetes Code of Conduct Committee (CoCC) is the body that is
+      responsible for enforcing and maintaining the Kubernetes Code of Conduct.
+    label: conduct
+    charter_link:
+    leadership:
+      chairs:
+      - name: Jaice Singer Dumars
+        github: jdumars
+        company: Google
+      - name: Paris Pittman
+        github: parispittman
+        company: Google
+      - name: Carolyn Van Slyck
+        github: carolynvs
+        company: Microsoft
+      - name: Eric Paris
+        github: eparis
+        company: Red Hat
+      - name: Jennifer Rondeau
+        github: bradamant3
+        company: VMware
+    contact:
+      private_mailing_list: conduct@kubernetes.io
+      teams:
+      - name: code-of-conduct-committee
+        description: General Discussion