summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Allclair <tallclair@google.com>2020-03-05 16:28:59 -0800
committerTim Allclair <tallclair@google.com>2020-03-05 16:28:59 -0800
commitc97d0ceaf48a3593ce1298e971efa1091a02a5ec (patch)
tree39b64c0a766acc94ba166f3faa6b523125c3eed4
parente3a6b8172fec9506b15520549e52be683e30cbfb (diff)
PSC on/offboarding
-rw-r--r--OWNERS_ALIASES3
-rw-r--r--committee-product-security/README.md3
-rw-r--r--sig-list.md2
-rw-r--r--sigs.yaml9
4 files changed, 6 insertions, 11 deletions
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
index 3aceb451..020f4752 100644
--- a/OWNERS_ALIASES
+++ b/OWNERS_ALIASES
@@ -156,10 +156,9 @@ aliases:
committee-product-security:
- cjcullen
- joelsmith
- - jonpulsifer
- liggitt
- lukehinds
- - philips
+ - micahhausler
- tallclair
committee-steering:
- cblecker
diff --git a/committee-product-security/README.md b/committee-product-security/README.md
index d4429cb7..036781af 100644
--- a/committee-product-security/README.md
+++ b/committee-product-security/README.md
@@ -15,10 +15,9 @@ The Kubernetes Product Security Committee is the body that is responsible for re
* CJ Cullen (**[@cjcullen](https://github.com/cjcullen)**), Google
* Joel Smith (**[@joelsmith](https://github.com/joelsmith)**), Red Hat
-* Jonathan Pulsifer (**[@jonpulsifer](https://github.com/jonpulsifer)**), Shopify
* Jordan Liggitt (**[@liggitt](https://github.com/liggitt)**), Google
* Luke Hinds (**[@lukehinds](https://github.com/lukehinds)**), Red Hat
-* Brandon Philips (**[@philips](https://github.com/philips)**), Red Hat
+* Micah Hausler (**[@micahhausler](https://github.com/micahhausler)**), Amazon
* Tim Allclair (**[@tallclair](https://github.com/tallclair)**), Google
## Contact
diff --git a/sig-list.md b/sig-list.md
index 3c89b6fb..7ebc3e86 100644
--- a/sig-list.md
+++ b/sig-list.md
@@ -75,7 +75,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>* [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>* [Luke Hinds](https://github.com/lukehinds), Red Hat<br>* [Brandon Philips](https://github.com/philips), Red Hat<br>* [Tim Allclair](https://github.com/tallclair), Google<br>|* [Private Mailing List](security@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>* [Jordan Liggitt](https://github.com/liggitt), Google<br>* [Luke Hinds](https://github.com/lukehinds), Red Hat<br>* [Micah Hausler](https://github.com/micahhausler), Amazon<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 f06ebb8e..3e32ea50 100644
--- a/sigs.yaml
+++ b/sigs.yaml
@@ -2857,18 +2857,15 @@ committees:
- github: joelsmith
name: Joel Smith
company: Red Hat
- - github: jonpulsifer
- name: Jonathan Pulsifer
- company: Shopify
- github: liggitt
name: Jordan Liggitt
company: Google
- github: lukehinds
name: Luke Hinds
company: Red Hat
- - github: philips
- name: Brandon Philips
- company: Red Hat
+ - github: micahhausler
+ name: Micah Hausler
+ company: Amazon
- github: tallclair
name: Tim Allclair
company: Google