summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKubernetes Prow Robot <k8s-ci-robot@users.noreply.github.com>2020-08-17 16:47:31 -0700
committerGitHub <noreply@github.com>2020-08-17 16:47:31 -0700
commit042df2dedefecc0f5928f068c1c6ee1b1930f623 (patch)
tree708cf971190e17e80e073f959f54f62d2d4e92e3
parent0ea3e6c4ca9efeb36a92bcf1d4b7a4c8d4fb50e1 (diff)
parentade1b3b5672cf8e66c0feb6c59b915814d490f2d (diff)
Merge pull request #5042 from cji/jobchange
Update cji's company affiliation
-rw-r--r--committee-product-security/README.md2
-rw-r--r--sig-list.md4
-rw-r--r--sigs.yaml4
-rw-r--r--wg-security-audit/README.md2
4 files changed, 6 insertions, 6 deletions
diff --git a/committee-product-security/README.md b/committee-product-security/README.md
index 4e597834..e7306886 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 59b94fb6..81f677b9 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<br>* Auth<br>* Network<br>* Node<br>* Scheduling<br>* Storage<br>|* [Sanjeev Rampal](https://github.com/srampal), Cisco<br>* [Tasha Drew](https://github.com/tashimi), VMware<br>|* [Slack](https://kubernetes.slack.com/messages/wg-multitenancy)<br>* [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)<br>
|[Naming](wg-naming/README.md)|* Architecture<br>* Contributor Experience<br>* Docs<br>|* [Celeste Horgan](https://github.com/celestehorgan), CNCF<br>* [Jaice Singer DuMars](https://github.com/jdumars), Apple<br>* [Stephen Augustus](https://github.com/justaugustus), VMware<br>* [Zach Corleissen](https://github.com/zacharysarah), Linux Foundation<br>|* [Slack](https://kubernetes.slack.com/messages/wg-naming)<br>* [Mailing List](https://groups.google.com/forum/#!forum/kubernetes-wg-naming)|
|[Policy](wg-policy/README.md)|* Architecture<br>* Auth<br>* Multicluster<br>* Network<br>* Node<br>* Scheduling<br>* Storage<br>|* [Erica von Buelow](https://github.com/ericavonb), Red Hat<br>* [Howard Huang](https://github.com/hannibalhuang), Huawei<br>|* [Slack](https://kubernetes.slack.com/messages/wg-policy)<br>* [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)<br>
-|[Security Audit](wg-security-audit/README.md)|* Auth<br>|* [Aaron Small](https://github.com/aasmall), Google<br>* [Craig Ingram](https://github.com/cji), Salesforce<br>* [Jay Beale](https://github.com/jaybeale), InGuardians<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/wg-security-audit)<br>* [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)<br>
+|[Security Audit](wg-security-audit/README.md)|* Auth<br>|* [Aaron Small](https://github.com/aasmall), Google<br>* [Craig Ingram](https://github.com/cji), Stripe<br>* [Jay Beale](https://github.com/jaybeale), InGuardians<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>|* [Slack](https://kubernetes.slack.com/messages/wg-security-audit)<br>* [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)<br>
### 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<br>* [Celeste Horgan](https://github.com/celestehorgan), CNCF<br>* [Karen Chu](https://github.com/karenhchu), Microsoft<br>* [Tasha Drew](https://github.com/tashimi), VMware<br>* [Tim Pepper](https://github.com/tpepper), 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>* [Craig Ingram](https://github.com/cji), Salesforce<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>* [Luke Hinds](https://github.com/lukehinds), Red Hat<br>* [Micah Hausler](https://github.com/micahhausler), Amazon<br>* [Swamy Shivaganga Nagaraju](https://github.com/swamymsft), Microsoft<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>* [Craig Ingram](https://github.com/cji), Stripe<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>* [Luke Hinds](https://github.com/lukehinds), Red Hat<br>* [Micah Hausler](https://github.com/micahhausler), Amazon<br>* [Swamy Shivaganga Nagaraju](https://github.com/swamymsft), Microsoft<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>* [Lachlan Evenson](https://github.com/lachie83), Microsoft<br>* [Nikhita Raghunath](https://github.com/nikhita), VMware<br>* [Paris Pittman](https://github.com/parispittman), Apple<br>* [Aaron Crickenberger](https://github.com/spiffxp), Google<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 e4493673..ff7ba8ef 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 bc9876d5..94c0f89c 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