diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES index ec10c82f6..eb260d10b 100644 --- a/OWNERS_ALIASES +++ b/OWNERS_ALIASES @@ -151,10 +151,10 @@ aliases: - mylesagray - phenixblue committee-code-of-conduct: + - detiber - endocrimes - hlipsig - jeremyrickard - - palnabarun - salaxander committee-security-response: - cjcullen diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md index af13794aa..c318183e9 100644 --- a/committee-code-of-conduct/README.md +++ b/committee-code-of-conduct/README.md @@ -14,10 +14,10 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc ## Members +* Jason DeTiberus (**[@detiber](https://github.com/detiber)**), Cisco * Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), VMware * Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), RedHat * Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft -* Nabarun Pal (**[@palnabarun](https://github.com/palnabarun)**), VMware * Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Microsoft ## Contact diff --git a/sig-list.md b/sig-list.md index 073b087df..d572b83e3 100644 --- a/sig-list.md +++ b/sig-list.md @@ -81,7 +81,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)|* [Danielle Lancashire](https://github.com/endocrimes), VMware
* [Hilliary Lipsig](https://github.com/hlipsig), RedHat
* [Jeremy Rickard](https://github.com/jeremyrickard), Microsoft
* [Nabarun Pal](https://github.com/palnabarun), VMware
* [Xander Grzywinski](https://github.com/salaxander), Microsoft
|* [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)|* [Jason DeTiberus](https://github.com/detiber), Cisco
* [Danielle Lancashire](https://github.com/endocrimes), VMware
* [Hilliary Lipsig](https://github.com/hlipsig), RedHat
* [Jeremy Rickard](https://github.com/jeremyrickard), Microsoft
* [Xander Grzywinski](https://github.com/salaxander), Microsoft
|* [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)|* [CJ Cullen](https://github.com/cjcullen), Google
* [Mo Khan](https://github.com/enj), Microsoft
* [Joel Smith](https://github.com/joelsmith), Red Hat
* [Luke Hinds](https://github.com/lukehinds), Red Hat
* [Micah Hausler](https://github.com/micahhausler), Amazon
* [Tabitha Sable](https://github.com/tabbysable), Datadog
* [Tim Allclair](https://github.com/tallclair), Google
|* [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
* [Christoph Blecker](https://github.com/cblecker), Red Hat
* [Stephen Augustus](https://github.com/justaugustus), Cisco
* [Bob Killen](https://github.com/mrbobbytables), Google
* [Nabarun Pal](https://github.com/palnabarun), VMware
* [Paris Pittman](https://github.com/parispittman), Apple
* [Tim Pepper](https://github.com/tpepper), VMware
|* [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 568718914..5eff7a290 100644 --- a/sigs.yaml +++ b/sigs.yaml @@ -3355,6 +3355,9 @@ committees: label: code-of-conduct leadership: chairs: + - github: detiber + name: Jason DeTiberus + company: Cisco - github: endocrimes name: Danielle Lancashire company: VMware @@ -3364,9 +3367,6 @@ committees: - github: jeremyrickard name: Jeremy Rickard company: Microsoft - - github: palnabarun - name: Nabarun Pal - company: VMware - github: salaxander name: Xander Grzywinski company: Microsoft @@ -3385,6 +3385,8 @@ committees: name: Jaice Singer DuMars - github: karenhchu name: Karen Chu + - github: palnabarun + name: Nabarun Pal - github: parispittman name: Paris Pittman - github: tashimi