From ade1b3b5672cf8e66c0feb6c59b915814d490f2d Mon Sep 17 00:00:00 2001 From: cji Date: Mon, 17 Aug 2020 19:10:24 -0400 Subject: [PATCH] Update affiliation for cji --- committee-product-security/README.md | 2 +- sig-list.md | 4 ++-- sigs.yaml | 4 ++-- wg-security-audit/README.md | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/committee-product-security/README.md b/committee-product-security/README.md index 4e597834c..e73068869 100644 --- a/committee-product-security/README.md +++ b/committee-product-security/README.md @@ -14,7 +14,7 @@ The Kubernetes Product Security Committee is the body that is responsible for re ## Members * CJ Cullen (**[@cjcullen](https://github.com/cjcullen)**), Google -* Craig Ingram (**[@cji](https://github.com/cji)**), Salesforce +* Craig Ingram (**[@cji](https://github.com/cji)**), Stripe * Joel Smith (**[@joelsmith](https://github.com/joelsmith)**), Red Hat * Luke Hinds (**[@lukehinds](https://github.com/lukehinds)**), Red Hat * Micah Hausler (**[@micahhausler](https://github.com/micahhausler)**), Amazon diff --git a/sig-list.md b/sig-list.md index 59b94fb63..81f677b98 100644 --- a/sig-list.md +++ b/sig-list.md @@ -60,7 +60,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md) |[Multitenancy](wg-multitenancy/README.md)|* API Machinery
* Auth
* Network
* Node
* Scheduling
* Storage
|* [Sanjeev Rampal](https://github.com/srampal), Cisco
* [Tasha Drew](https://github.com/tashimi), VMware
|* [Slack](https://kubernetes.slack.com/messages/wg-multitenancy)
* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-multitenancy)|* Regular WG Meeting: [Tuesdays at 11:00 PT (Pacific Time) (biweekly)](https://zoom.us/my/k8s.sig.auth)
|[Naming](wg-naming/README.md)|* Architecture
* Contributor Experience
* Docs
|* [Celeste Horgan](https://github.com/celestehorgan), CNCF
* [Jaice Singer DuMars](https://github.com/jdumars), Apple
* [Stephen Augustus](https://github.com/justaugustus), VMware
* [Zach Corleissen](https://github.com/zacharysarah), Linux Foundation
|* [Slack](https://kubernetes.slack.com/messages/wg-naming)
* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-naming)| |[Policy](wg-policy/README.md)|* Architecture
* Auth
* Multicluster
* Network
* Node
* Scheduling
* Storage
|* [Erica von Buelow](https://github.com/ericavonb), Red Hat
* [Howard Huang](https://github.com/hannibalhuang), Huawei
|* [Slack](https://kubernetes.slack.com/messages/wg-policy)
* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-policy)|* Regular WG Meeting: [Wednesdays at 16:00 PT (Pacific Time) (weekly)](https://zoom.us/j/7375677271)
-|[Security Audit](wg-security-audit/README.md)|* Auth
|* [Aaron Small](https://github.com/aasmall), Google
* [Craig Ingram](https://github.com/cji), Salesforce
* [Jay Beale](https://github.com/jaybeale), InGuardians
* [Joel Smith](https://github.com/joelsmith), Red Hat
|* [Slack](https://kubernetes.slack.com/messages/wg-security-audit)
* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-security-audit)|* Regular WG Meeting: [Mondays at 12:00 PT (Pacific Time) (weekly)](https://docs.google.com/document/d/1RbC4SBZBlKth7IjYv_NaEpnmLGwMJ0ElpUOmsG-bdRA/edit)
+|[Security Audit](wg-security-audit/README.md)|* Auth
|* [Aaron Small](https://github.com/aasmall), Google
* [Craig Ingram](https://github.com/cji), Stripe
* [Jay Beale](https://github.com/jaybeale), InGuardians
* [Joel Smith](https://github.com/joelsmith), Red Hat
|* [Slack](https://kubernetes.slack.com/messages/wg-security-audit)
* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-security-audit)|* Regular WG Meeting: [Mondays at 12:00 PT (Pacific Time) (weekly)](https://docs.google.com/document/d/1RbC4SBZBlKth7IjYv_NaEpnmLGwMJ0ElpUOmsG-bdRA/edit)
### Master User Group List @@ -74,7 +74,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
* [Celeste Horgan](https://github.com/celestehorgan), CNCF
* [Karen Chu](https://github.com/karenhchu), Microsoft
* [Tasha Drew](https://github.com/tashimi), VMware
* [Tim Pepper](https://github.com/tpepper), VMware
|* [Private Mailing List](conduct@kubernetes.io) -|[Product Security](committee-product-security/README.md)|product-security|* [CJ Cullen](https://github.com/cjcullen), Google
* [Craig Ingram](https://github.com/cji), Salesforce
* [Joel Smith](https://github.com/joelsmith), Red Hat
* [Luke Hinds](https://github.com/lukehinds), Red Hat
* [Micah Hausler](https://github.com/micahhausler), Amazon
* [Swamy Shivaganga Nagaraju](https://github.com/swamymsft), Microsoft
* [Tim Allclair](https://github.com/tallclair), Google
|* [Private Mailing List](security@kubernetes.io) +|[Product Security](committee-product-security/README.md)|product-security|* [CJ Cullen](https://github.com/cjcullen), Google
* [Craig Ingram](https://github.com/cji), Stripe
* [Joel Smith](https://github.com/joelsmith), Red Hat
* [Luke Hinds](https://github.com/lukehinds), Red Hat
* [Micah Hausler](https://github.com/micahhausler), Amazon
* [Swamy Shivaganga Nagaraju](https://github.com/swamymsft), Microsoft
* [Tim Allclair](https://github.com/tallclair), Google
|* [Private Mailing List](security@kubernetes.io) |[Steering](committee-steering/README.md)|steering|* [Christoph Blecker](https://github.com/cblecker), Red Hat
* [Derek Carr](https://github.com/derekwaynecarr), Red Hat
* [Davanum Srinivas](https://github.com/dims), VMware
* [Lachlan Evenson](https://github.com/lachie83), Microsoft
* [Nikhita Raghunath](https://github.com/nikhita), VMware
* [Paris Pittman](https://github.com/parispittman), Apple
* [Aaron Crickenberger](https://github.com/spiffxp), Google
|* [Slack](https://kubernetes.slack.com/messages/steering-committee)
* [Mailing List](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering)
* [Private Mailing List](steering-private@kubernetes.io) diff --git a/sigs.yaml b/sigs.yaml index e44936732..ff7ba8ef8 100644 --- a/sigs.yaml +++ b/sigs.yaml @@ -2760,7 +2760,7 @@ workinggroups: company: Google - github: cji name: Craig Ingram - company: Salesforce + company: Stripe - github: jaybeale name: Jay Beale company: InGuardians @@ -2900,7 +2900,7 @@ committees: company: Google - github: cji name: Craig Ingram - company: Salesforce + company: Stripe - github: joelsmith name: Joel Smith company: Red Hat diff --git a/wg-security-audit/README.md b/wg-security-audit/README.md index bc9876d5e..94c0f89c2 100644 --- a/wg-security-audit/README.md +++ b/wg-security-audit/README.md @@ -19,7 +19,7 @@ Perform a security audit on k8s with a vendor and produce as artifacts a threat ## Organizers * Aaron Small (**[@aasmall](https://github.com/aasmall)**), Google -* Craig Ingram (**[@cji](https://github.com/cji)**), Salesforce +* Craig Ingram (**[@cji](https://github.com/cji)**), Stripe * Jay Beale (**[@jaybeale](https://github.com/jaybeale)**), InGuardians * Joel Smith (**[@joelsmith](https://github.com/joelsmith)**), Red Hat