Skip to content

Commit 042df2d

Browse files
authored
Merge pull request #5042 from cji/jobchange
Update cji's company affiliation
2 parents 0ea3e6c + ade1b3b commit 042df2d

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

committee-product-security/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The Kubernetes Product Security Committee is the body that is responsible for re
1414
## Members
1515

1616
* CJ Cullen (**[@cjcullen](https://github.com/cjcullen)**), Google
17-
* Craig Ingram (**[@cji](https://github.com/cji)**), Salesforce
17+
* Craig Ingram (**[@cji](https://github.com/cji)**), Stripe
1818
* Joel Smith (**[@joelsmith](https://github.com/joelsmith)**), Red Hat
1919
* Luke Hinds (**[@lukehinds](https://github.com/lukehinds)**), Red Hat
2020
* Micah Hausler (**[@micahhausler](https://github.com/micahhausler)**), Amazon

sig-list.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
6060
|[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>
6161
|[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)|
6262
|[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>
63-
|[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>
63+
|[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>
6464

6565
### Master User Group List
6666

@@ -74,7 +74,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
7474
| Name | Label | Members | Contact |
7575
|------|--------|---------|---------|
7676
|[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]([email protected])
77-
|[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]([email protected])
77+
|[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]([email protected])
7878
|[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]([email protected])
7979
<!-- BEGIN CUSTOM CONTENT -->
8080

sigs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2760,7 +2760,7 @@ workinggroups:
27602760
company: Google
27612761
- github: cji
27622762
name: Craig Ingram
2763-
company: Salesforce
2763+
company: Stripe
27642764
- github: jaybeale
27652765
name: Jay Beale
27662766
company: InGuardians
@@ -2900,7 +2900,7 @@ committees:
29002900
company: Google
29012901
- github: cji
29022902
name: Craig Ingram
2903-
company: Salesforce
2903+
company: Stripe
29042904
- github: joelsmith
29052905
name: Joel Smith
29062906
company: Red Hat

wg-security-audit/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ Perform a security audit on k8s with a vendor and produce as artifacts a threat
1919
## Organizers
2020

2121
* Aaron Small (**[@aasmall](https://github.com/aasmall)**), Google
22-
* Craig Ingram (**[@cji](https://github.com/cji)**), Salesforce
22+
* Craig Ingram (**[@cji](https://github.com/cji)**), Stripe
2323
* Jay Beale (**[@jaybeale](https://github.com/jaybeale)**), InGuardians
2424
* Joel Smith (**[@joelsmith](https://github.com/joelsmith)**), Red Hat
2525

0 commit comments

Comments
 (0)