Merge pull request #4195 from cblecker/coc

Update Code of Conduct Committee membership

4 files changed, 13 insertions, 18 deletions

diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 9d0a4ce3..70d6d47a 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -146,9 +146,8 @@ aliases:
     - AevaOnline
     - Bradamant3
     - carolynvs
-    - eparis
     - jdumars
-    - parispittman
+    - tashimi
   committee-product-security:
     - cjcullen
     - joelsmith
diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md
index 4ea89c67..9a68912a 100644
--- a/committee-code-of-conduct/README.md
+++ b/committee-code-of-conduct/README.md
@@ -17,9 +17,8 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
 * Aeva van der Veen (**[@AevaOnline](https://github.com/AevaOnline)**), Microsoft
 * Jennifer Rondeau (**[@Bradamant3](https://github.com/Bradamant3)**), Stripe
 * Carolyn Van Slyck (**[@carolynvs](https://github.com/carolynvs)**), Microsoft
-* Eric Paris (**[@eparis](https://github.com/eparis)**), Red Hat
 * Jaice Singer DuMars (**[@jdumars](https://github.com/jdumars)**), Google
-* Paris Pittman (**[@parispittman](https://github.com/parispittman)**), Google
+* Tasha Drew (**[@tashimi](https://github.com/tashimi)**), VMware
 
 ## Contact
 - Private Mailing List: conduct@kubernetes.io
@@ -33,14 +32,14 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
 
 The members and their terms are as follows:
 
-### Term ends on August 7, 2019
-- Eric Paris (Red Hat) - 1 year
-- Jennifer Rondeau (Heptio) - 1 year
-
 ### Term ends on August 7, 2020
-- Jaice Singer Dumars (Google) - 2 years
-- Paris Pittman (Google) - 2 years
-- Carolyn Van Slyck (Microsoft) - 2 year
+- Jaice Singer Dumars (Google)
+- Jennifer Rondeau (Stripe)
+- Carolyn Van Slyck (Microsoft)
+
+### Term ends on August 7, 2021
+- Aeva van der Veen (Microsoft)
+- Tasha Drew (VMWare)
 
 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.
 
diff --git a/sig-list.md b/sig-list.md
index 23d17b92..79a87d44 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -73,7 +73,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)|code-of-conduct|* [Aeva van der Veen](https://github.com/AevaOnline), Microsoft<br>* [Jennifer Rondeau](https://github.com/Bradamant3), Stripe<br>* [Carolyn Van Slyck](https://github.com/carolynvs), Microsoft<br>* [Eric Paris](https://github.com/eparis), Red Hat<br>* [Jaice Singer DuMars](https://github.com/jdumars), Google<br>* [Paris Pittman](https://github.com/parispittman), Google<br>|* [Private Mailing List](conduct@kubernetes.io)
+|[Code of Conduct](committee-code-of-conduct/README.md)|code-of-conduct|* [Aeva van der Veen](https://github.com/AevaOnline), Microsoft<br>* [Jennifer Rondeau](https://github.com/Bradamant3), Stripe<br>* [Carolyn Van Slyck](https://github.com/carolynvs), Microsoft<br>* [Jaice Singer DuMars](https://github.com/jdumars), Google<br>* [Tasha Drew](https://github.com/tashimi), VMware<br>|* [Private Mailing List](conduct@kubernetes.io)
 |[Product Security](committee-product-security/README.md)|product-security|* [CJ Cullen](https://github.com/cjcullen), Google<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>* [Jonathan Pulsifer](https://github.com/jonpulsifer), Shopify<br>* [Jordan Liggitt](https://github.com/liggitt), Google<br>* [Brandon Philips](https://github.com/philips), Red Hat<br>* [Tim Allclair](https://github.com/tallclair), Google<br>|* [Private Mailing List](security@kubernetes.io)
 |[Steering](committee-steering/README.md)|steering|* [Christoph Blecker](https://github.com/cblecker), Red Hat<br>* [Derek Carr](https://github.com/derekwaynecarr), Red Hat<br>* [Davanum Srinivas](https://github.com/dims), VMware<br>* [Nikhita Raghunath](https://github.com/nikhita), Loodse<br>* [Paris Pittman](https://github.com/parispittman), Google<br>* [Aaron Crickenberger](https://github.com/spiffxp), Google<br>* [Timothy St. Clair](https://github.com/timothysc), VMware<br>|* [Slack](https://kubernetes.slack.com/messages/steering-committee)<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 34ce5ada..1384a33d 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -2681,15 +2681,12 @@ committees:
     - github: carolynvs
       name: Carolyn Van Slyck
       company: Microsoft
-    - github: eparis
-      name: Eric Paris
-      company: Red Hat
     - github: jdumars
       name: Jaice Singer DuMars
       company: Google
-    - github: parispittman
-      name: Paris Pittman
-      company: Google
+    - github: tashimi
+      name: Tasha Drew
+      company: VMware
   meetings: []
   contact:
     private_mailing_list: conduct@kubernetes.io