Skip to content

Commit dcbc241

Browse files
authored
Merge pull request #8314 from justaugustus/cocc-2025
Code of Conduct elections 2025
2 parents 90585b3 + c818786 commit dcbc241

File tree

10 files changed

+45
-15
lines changed

10 files changed

+45
-15
lines changed

committee-code-of-conduct/README.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
1414

1515
## Members
1616

17-
* Ana Margarita Medina (**[@AnaMMedina21](https://github.com/AnaMMedina21)**), Lightstep
17+
* Ana Margarita Medina (**[@AnaMMedina21](https://github.com/AnaMMedina21)**), Upbound
1818
* Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Independent
1919
* Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), Red Hat
2020
* Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft
21-
* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Defense Unicorns
21+
* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Independent
2222

2323
## Emeritus Members
2424

@@ -58,16 +58,16 @@ Our [Incident Report Handling Procedures](incident-process.md) describes how we
5858

5959
The members and their terms are as follows:
6060

61-
### Term ends on August 23, 2025
61+
### Term ends on February 17, 2026
6262

63-
- Jeremy Rickard (Microsoft)
64-
- Ana Margarita Medina (Lightstep)
63+
- Jeremy Rickard
64+
- Ana Margarita Medina
6565

66-
### Term ends on August 17, 2024
66+
### Term ends on February 17, 2025
6767

68-
- Danielle Lancashire (VMware)
69-
- Hilliary Lipsig (RedHat)
70-
- Xander Grzywinski (Microsoft)
68+
- Danielle Lancashire
69+
- Hilliary Lipsig
70+
- Xander Grzywinski
7171

7272
Please see the [bootstrapping document](./bootstrapping-process.md) and [election process guidelines](election.md) for more information on how members are picked and their responsibilities.
7373

elections/code-of-conduct/2025/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,5 @@ Nominees may be found in the [election app].
8181
[election page]: https://elections.k8s.io/app/elections/code-of-conduct---2025
8282
[Elekto]: https://elekto.dev
8383
[Elekto voting documentation]: https://elekto.dev/docs/voting/
84-
[Google Form]: https://forms.gle/YQvofRb14Jbu2mjc6 <!-- TODO(cocc): Generate new candidate submission form -->
84+
[Google Form]: https://forms.gle/4yTd7Cy7FDsvA3GJ8
8585
[CoCC Election Charter]: https://github.com/kubernetes/community/blob/master/committee-code-of-conduct/election.md
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-------------------------------------------------
2+
name: Divya Mohan
3+
ID: divya-mohan0209
4+
--------------------------------------------------
5+
6+
# Divya Mohan
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-------------------------------------------------
2+
name: Danielle Lancashire
3+
ID: endocrimes
4+
--------------------------------------------------
5+
6+
# Danielle Lancashire
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-------------------------------------------------
2+
name: Sreeram Venkitesh
3+
ID: sreeram-venkitesh
4+
--------------------------------------------------
5+
6+
# Sreeram Venkitesh
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-------------------------------------------------
2+
name: Sean McGinnis
3+
ID: stmcginnis
4+
--------------------------------------------------
5+
6+
# Sean McGinnis
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-------------------------------------------------
2+
name: Swati Sehgal
3+
ID: swatisehgal
4+
--------------------------------------------------
5+
6+
# Swati Sehgal

sig-docs/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ The Technical Leads of the SIG establish new subprojects, decommission existing
4747
subprojects, and resolve cross-subproject technical issues and decisions.
4848

4949
* Kat Cosgrove (**[@katcosgrove](https://github.com/katcosgrove)**), Dell
50-
* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Defense Unicorns
50+
* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Independent
5151
* Qiming Teng (**[@tengqm](https://github.com/tengqm)**), Sangfor Technologies
5252

5353
## Emeritus Leads

sig-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
7474

7575
| Name | Label | Members | Contact |
7676
|------|--------|---------|---------|
77-
|[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), Lightstep<br>* [Danielle Lancashire](https://github.com/endocrimes), Independent<br>* [Hilliary Lipsig](https://github.com/hlipsig), Red Hat<br>* [Jeremy Rickard](https://github.com/jeremyrickard), Microsoft<br>* [Xander Grzywinski](https://github.com/salaxander), Defense Unicorns<br>|* [Slack](https://kubernetes.slack.com/messages/code-of-conduct)<br>* [Private Mailing List]([email protected])
77+
|[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<br>* [Danielle Lancashire](https://github.com/endocrimes), Independent<br>* [Hilliary Lipsig](https://github.com/hlipsig), Red Hat<br>* [Jeremy Rickard](https://github.com/jeremyrickard), Microsoft<br>* [Xander Grzywinski](https://github.com/salaxander), Independent<br>|* [Slack](https://kubernetes.slack.com/messages/code-of-conduct)<br>* [Private Mailing List]([email protected])
7878
|[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<br>* [CJ Cullen](https://github.com/cjcullen), Google<br>* [Craig Ingram](https://github.com/cji), Google<br>* [Mo Khan](https://github.com/enj), Microsoft<br>* [Joel Smith](https://github.com/joelsmith), Red Hat<br>* [Micah Hausler](https://github.com/micahhausler), Amazon<br>* [Rita Zhang](https://github.com/ritazh), Microsoft<br>* [Tabitha Sable](https://github.com/tabbysable), Datadog<br>|* [Private Mailing List]([email protected])
7979
|[Steering](committee-steering/README.md)|[steering](https://github.com/kubernetes/kubernetes/labels/committee%2Fsteering)|* [Benjamin Elder](https://github.com/BenTheElder), Google<br>* [Antonio Ojea](https://github.com/aojea), Google<br>* [Stephen Augustus](https://github.com/justaugustus), Bloomberg L.P.<br>* [Paco Xu 徐俊杰](https://github.com/pacoxu), DaoCloud<br>* [Patrick Ohly](https://github.com/pohly), Intel<br>* [Sascha Grunert](https://github.com/saschagrunert), Red Hat<br>* [Maciej Szulik](https://github.com/soltysh), Defense Unicorns<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])
8080
<!-- BEGIN CUSTOM CONTENT -->

sigs.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1585,7 +1585,7 @@ sigs:
15851585
15861586
- github: salaxander
15871587
name: Xander Grzywinski
1588-
company: Defense Unicorns
1588+
company: Independent
15891589
15901590
- github: tengqm
15911591
name: Qiming Teng
@@ -3768,7 +3768,7 @@ committees:
37683768
chairs:
37693769
- github: AnaMMedina21
37703770
name: Ana Margarita Medina
3771-
company: Lightstep
3771+
company: Upbound
37723772
- github: endocrimes
37733773
name: Danielle Lancashire
37743774
company: Independent
@@ -3780,7 +3780,7 @@ committees:
37803780
company: Microsoft
37813781
- github: salaxander
37823782
name: Xander Grzywinski
3783-
company: Defense Unicorns
3783+
company: Independent
37843784
emeritus_leads:
37853785
- github: AevaOnline
37863786
name: Aeva Black

0 commit comments

Comments
 (0)