Merge pull request #8314 from justaugustus/cocc-2025

k8s-ci-robot · web-flow · commit dcbc241d6876 · 2025-02-05T07:34:16.000-08:00
Code of Conduct elections 2025
diff --git a/committee-code-of-conduct/README.md b/committee-code-of-conduct/README.md
@@ -14,11 +14,11 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
 
 ## Members
 
-* Ana Margarita Medina (**[@AnaMMedina21](https://github.com/AnaMMedina21)**), Lightstep
+* 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
 * Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft
-* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Defense Unicorns
+* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Independent
 
 ## Emeritus Members
 
@@ -58,16 +58,16 @@ Our [Incident Report Handling Procedures](incident-process.md) describes how we
 
 The members and their terms are as follows:
 
-### Term ends on August 23, 2025
+### Term ends on February 17, 2026
 
-- Jeremy Rickard (Microsoft)
-- Ana Margarita Medina (Lightstep)
+- Jeremy Rickard
+- Ana Margarita Medina
 
-### Term ends on August 17, 2024
+### Term ends on February 17, 2025
 
-- Danielle Lancashire (VMware)
-- Hilliary Lipsig (RedHat)
-- Xander Grzywinski (Microsoft)
+- Danielle Lancashire
+- Hilliary Lipsig
+- Xander Grzywinski
 
 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.
 
diff --git a/elections/code-of-conduct/2025/README.md b/elections/code-of-conduct/2025/README.md
@@ -81,5 +81,5 @@ Nominees may be found in the [election app].
 [election page]: https://elections.k8s.io/app/elections/code-of-conduct---2025
 [Elekto]: https://elekto.dev
 [Elekto voting documentation]: https://elekto.dev/docs/voting/
-[Google Form]: https://forms.gle/YQvofRb14Jbu2mjc6 <!-- TODO(cocc): Generate new candidate submission form -->
+[Google Form]: https://forms.gle/4yTd7Cy7FDsvA3GJ8
 [CoCC Election Charter]: https://github.com/kubernetes/community/blob/master/committee-code-of-conduct/election.md
diff --git a/elections/code-of-conduct/2025/candidate-divya-mohan0209.md b/elections/code-of-conduct/2025/candidate-divya-mohan0209.md
@@ -0,0 +1,6 @@
+-------------------------------------------------
+name: Divya Mohan
+ID:	divya-mohan0209
+--------------------------------------------------
+
+# Divya Mohan
diff --git a/elections/code-of-conduct/2025/candidate-endocrimes.md b/elections/code-of-conduct/2025/candidate-endocrimes.md
@@ -0,0 +1,6 @@
+-------------------------------------------------
+name: Danielle Lancashire
+ID:	endocrimes
+--------------------------------------------------
+
+# Danielle Lancashire
diff --git a/elections/code-of-conduct/2025/candidate-sreeram-venkitesh.md b/elections/code-of-conduct/2025/candidate-sreeram-venkitesh.md
@@ -0,0 +1,6 @@
+-------------------------------------------------
+name: Sreeram Venkitesh
+ID:	sreeram-venkitesh
+--------------------------------------------------
+
+# Sreeram Venkitesh
diff --git a/elections/code-of-conduct/2025/candidate-stmcginnis.md b/elections/code-of-conduct/2025/candidate-stmcginnis.md
@@ -0,0 +1,6 @@
+-------------------------------------------------
+name: Sean McGinnis
+ID:	stmcginnis
+--------------------------------------------------
+
+# Sean McGinnis
diff --git a/elections/code-of-conduct/2025/candidate-swatisehgal.md b/elections/code-of-conduct/2025/candidate-swatisehgal.md
@@ -0,0 +1,6 @@
+-------------------------------------------------
+name: Swati Sehgal
+ID:	swatisehgal
+--------------------------------------------------
+
+# Swati Sehgal
diff --git a/sig-docs/README.md b/sig-docs/README.md
@@ -47,7 +47,7 @@ The Technical Leads of the SIG establish new subprojects, decommission existing
 subprojects, and resolve cross-subproject technical issues and decisions.
 
 * Kat Cosgrove (**[@katcosgrove](https://github.com/katcosgrove)**), Dell
-* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Defense Unicorns
+* Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Independent
 * Qiming Teng (**[@tengqm](https://github.com/tengqm)**), Sangfor Technologies
 
 ## Emeritus Leads
diff --git 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), 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](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<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](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<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](security@kubernetes.io)
 |[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](steering-private@kubernetes.io)
 <!-- BEGIN CUSTOM CONTENT -->
diff --git a/sigs.yaml b/sigs.yaml
@@ -1585,7 +1585,7 @@ sigs:
       email: kat.cosgrove@gmail.com
     - github: salaxander
       name: Xander Grzywinski
-      company: Defense Unicorns
+      company: Independent
       email: xandergrzyw@gmail.com
     - github: tengqm
       name: Qiming Teng
@@ -3768,7 +3768,7 @@ committees:
     chairs:
     - github: AnaMMedina21
       name: Ana Margarita Medina
-      company: Lightstep
+      company: Upbound
     - github: endocrimes
       name: Danielle Lancashire
       company: Independent
@@ -3780,7 +3780,7 @@ committees:
       company: Microsoft
     - github: salaxander
       name: Xander Grzywinski
-      company: Defense Unicorns
+      company: Independent
     emeritus_leads:
     - github: AevaOnline
       name: Aeva Black
