diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index eac300351..fa4f47e9d 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -156,10 +156,10 @@ aliases: - pohly committee-code-of-conduct: - AnaMMedina21 + - divya-mohan0209 - endocrimes - - hlipsig - jeremyrickard - - salaxander + - stmcginnis committee-security-response: - SaranBalaji90 - cjcullen diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md index e829993a9..a3785a42e 100644 --- a/committee-code-of-conduct/README.md +++ b/committee-code-of-conduct/README.md @@ -15,10 +15,10 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc ## Members * Ana Margarita Medina (**[@AnaMMedina21](https://github.com/AnaMMedina21)**), Upbound -* Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Independent -* Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), Red Hat +* Divya Mohan (**[@divya-mohan0209](https://github.com/divya-mohan0209)**), SUSE +* Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Fermyon * Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft -* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Independent +* Sean McGinnis (**[@stmcginnis](https://github.com/stmcginnis)**), Lambda, Inc ## Emeritus Members @@ -29,10 +29,12 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc * Carlos Tadeu Panato Jr. (**[@cpanato](https://github.com/cpanato)**) * Jason DeTiberus (**[@detiber](https://github.com/detiber)**) * Eric Paris (**[@eparis](https://github.com/eparis)**) +* Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**) * Jaice Singer DuMars (**[@jdumars](https://github.com/jdumars)**) * Karen Chu (**[@karenhchu](https://github.com/karenhchu)**) * Nabarun Pal (**[@palnabarun](https://github.com/palnabarun)**) * Paris Pittman (**[@parispittman](https://github.com/parispittman)**) +* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**) * Tasha Drew (**[@tashimi](https://github.com/tashimi)**) * Tim Pepper (**[@tpepper](https://github.com/tpepper)**) * Vallery Lancey (**[@vllry](https://github.com/vllry)**) diff --git a/sig-list.md b/sig-list.md index a45672f95..d9890c493 100644 --- a/sig-list.md +++ b/sig-list.md @@ -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](https://github.com/kubernetes/kubernetes/labels/committee%2Fcode-of-conduct)|* [Ana Margarita Medina](https://github.com/AnaMMedina21), Upbound
* [Danielle Lancashire](https://github.com/endocrimes), Independent
* [Hilliary Lipsig](https://github.com/hlipsig), Red Hat
* [Jeremy Rickard](https://github.com/jeremyrickard), Microsoft
* [Xander Grzywinski](https://github.com/salaxander), Independent
|* [Slack](https://kubernetes.slack.com/messages/code-of-conduct)
* [Private Mailing List](conduct@kubernetes.io) +|[Code of Conduct](committee-code-of-conduct/README.md)|[code-of-conduct](https://github.com/kubernetes/kubernetes/labels/committee%2Fcode-of-conduct)|* [Ana Margarita Medina](https://github.com/AnaMMedina21), Upbound
* [Divya Mohan](https://github.com/divya-mohan0209), SUSE
* [Danielle Lancashire](https://github.com/endocrimes), Fermyon
* [Jeremy Rickard](https://github.com/jeremyrickard), Microsoft
* [Sean McGinnis](https://github.com/stmcginnis), Lambda, Inc
|* [Slack](https://kubernetes.slack.com/messages/code-of-conduct)
* [Private Mailing List](conduct@kubernetes.io) |[Security Response](committee-security-response/README.md)|[security-response](https://github.com/kubernetes/kubernetes/labels/committee%2Fsecurity-response)|* [Sri Saran Balaji](https://github.com/SaranBalaji90), Amazon
* [CJ Cullen](https://github.com/cjcullen), Google
* [Craig Ingram](https://github.com/cji), Google
* [Mo Khan](https://github.com/enj), Microsoft
* [Joel Smith](https://github.com/joelsmith), Red Hat
* [Micah Hausler](https://github.com/micahhausler), Amazon
* [Rita Zhang](https://github.com/ritazh), Microsoft
* [Tabitha Sable](https://github.com/tabbysable), Datadog
|* [Private Mailing List](security@kubernetes.io) |[Steering](committee-steering/README.md)|[steering](https://github.com/kubernetes/kubernetes/labels/committee%2Fsteering)|* [Benjamin Elder](https://github.com/BenTheElder), Google
* [Antonio Ojea](https://github.com/aojea), Google
* [Stephen Augustus](https://github.com/justaugustus), Bloomberg
* [Paco Xu 徐俊杰](https://github.com/pacoxu), DaoCloud
* [Patrick Ohly](https://github.com/pohly), Intel
* [Sascha Grunert](https://github.com/saschagrunert), Red Hat
* [Maciej Szulik](https://github.com/soltysh), Defense Unicorns
|* [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 7d5432f2a..e52cea8ea 100644 --- a/sigs.yaml +++ b/sigs.yaml @@ -3841,18 +3841,18 @@ committees: - github: AnaMMedina21 name: Ana Margarita Medina company: Upbound + - github: divya-mohan0209 + name: Divya Mohan + company: SUSE - github: endocrimes name: Danielle Lancashire - company: Independent - - github: hlipsig - name: Hilliary Lipsig - company: Red Hat + company: Fermyon - github: jeremyrickard name: Jeremy Rickard company: Microsoft - - github: salaxander - name: Xander Grzywinski - company: Independent + - github: stmcginnis + name: Sean McGinnis + company: Lambda, Inc emeritus_leads: - github: AevaOnline name: Aeva Black @@ -3868,6 +3868,8 @@ committees: name: Jason DeTiberus - github: eparis name: Eric Paris + - github: hlipsig + name: Hilliary Lipsig - github: jdumars name: Jaice Singer DuMars - github: karenhchu @@ -3876,6 +3878,8 @@ committees: name: Nabarun Pal - github: parispittman name: Paris Pittman + - github: salaxander + name: Xander Grzywinski - github: tashimi name: Tasha Drew - github: tpepper