Merge branch 'kubernetes:master' into master

Author: divya-mohan0209

CONTRIBUTING.md

@@ -6,8 +6,8 @@ Welcome to the Kubernetes Community contributing guide. We are excited about the
 
 We have full documentation on how to get started contributing here:
 
-- [Kubernetes Contributor Guide](http://git.k8s.io/community/contributors/guide) - Main contributor documentation
-- [Contributor Cheat Sheet](./contributors/guide/contributor-cheatsheet/) - Common resources for existing developers
+- [Kubernetes Contributor Guide](https://www.kubernetes.dev/docs/guide/) - Main contributor documentation
+- [Contributor Cheat Sheet](https://www.kubernetes.dev/docs/contributor-cheatsheet/) - Common resources for existing developers
 
 ## Mentorship
 

OWNERS_ALIASES

@@ -40,11 +40,7 @@ aliases:
   sig-contributor-experience-leads:
     - MadhavJivrajani
     - Priyankasaggu11929
-    - cblecker
-    - jberkus
     - kaslin
-    - mrbobbytables
-    - nikhita
     - palnabarun
   sig-docs-leads:
     - divya-mohan0209
@@ -54,20 +50,26 @@ aliases:
     - reylejano
     - sftim
     - tengqm
+  sig-etcd-leads:
+    - ahrtr
+    - jmhbnz
+    - serathius
+    - wenjiaswe
   sig-instrumentation-leads:
     - dashpole
     - dgrisonnet
     - ehashman
     - logicalhan
   sig-k8s-infra-leads:
+    - BenTheElder
     - ameukam
     - dims
-    - spiffxp
-    - thockin
+    - upodroid
   sig-multicluster-leads:
     - jeremyot
     - pmorie
   sig-network-leads:
+    - danwinship
     - mikezappa87
     - shaneutt
     - thockin
@@ -123,8 +125,8 @@ aliases:
     - kwiesmueller
   wg-batch-leads:
     - Huang-Wei
-    - ahg-g
     - endocrimes
+    - mwielgus
     - soltysh
     - swatisehgal
   wg-data-protection-leads:
@@ -142,8 +144,8 @@ aliases:
     - JimBugwadia
     - rficcaglia
   wg-structured-logging-leads:
+    - mengjiao-liu
     - pohly
-    - serathius
   committee-code-of-conduct:
     - AnaMMedina21
     - endocrimes
@@ -161,12 +163,12 @@ aliases:
     - tabbysable
   committee-steering:
     - BenTheElder
-    - cblecker
-    - cpanato
     - justaugustus
     - mrbobbytables
+    - pacoxu
     - palnabarun
-    - tpepper
+    - pohly
+    - soltysh
 ## BEGIN CUSTOM CONTENT
   provider-aws:
     - justinsb
@@ -181,9 +183,10 @@ aliases:
   provider-ibmcloud:
     - spzala
   provider-openstack:
-    - chrigl
-    - lingxiankong
-    - ramineni
+    - dulek
+    - jichenjc
+    - kayrus
+    - zetaab
   provider-vmware:
     - cantbewong
     - frapposelli

committee-code-of-conduct/README.md

@@ -16,17 +16,34 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
 
 * Ana Margarita Medina (**[@AnaMMedina21](https://github.com/AnaMMedina21)**), Lightstep
 * Danielle Lancashire (**[@endocrimes](https://github.com/endocrimes)**), Independent
-* Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), RedHat
+* Hilliary Lipsig (**[@hlipsig](https://github.com/hlipsig)**), Red Hat
 * Jeremy Rickard (**[@jeremyrickard](https://github.com/jeremyrickard)**), Microsoft
 * Xander Grzywinski (**[@salaxander](https://github.com/salaxander)**), Microsoft
 
+## Emeritus Members
+
+* Aeva Black (**[@AevaOnline](https://github.com/AevaOnline)**)
+* Jennifer Rondeau (**[@Bradamant3](https://github.com/Bradamant3)**)
+* Carolyn Van Slyck (**[@carolynvs](https://github.com/carolynvs)**)
+* Celeste Horgan (**[@celestehorgan](https://github.com/celestehorgan)**)
+* Carlos Tadeu Panato Jr. (**[@cpanato](https://github.com/cpanato)**)
+* Jason DeTiberus (**[@detiber](https://github.com/detiber)**)
+* Eric Paris (**[@eparis](https://github.com/eparis)**)
+* 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)**)
+* Tasha Drew (**[@tashimi](https://github.com/tashimi)**)
+* Tim Pepper (**[@tpepper](https://github.com/tpepper)**)
+* Vallery Lancey (**[@vllry](https://github.com/vllry)**)
+
 ## Contact
 - Slack: [#code-of-conduct](https://kubernetes.slack.com/messages/code-of-conduct)
 - Private Mailing List: [email protected]
 - [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/committee%2Fcode-of-conduct)
 - GitHub Teams:
     - [@kubernetes/code-of-conduct-committee](https://github.com/orgs/kubernetes/teams/code-of-conduct-committee) - General Discussion
-- Steering Committee Liaison: Tim Pepper (**[@tpepper](https://github.com/tpepper)**)
+- Steering Committee Liaison: Nabarun Pal (**[@palnabarun](https://github.com/palnabarun)**)
 
 [subproject-definition]: https://github.com/kubernetes/community/blob/master/governance.md#subprojects
 <!-- BEGIN CUSTOM CONTENT -->
@@ -41,10 +58,10 @@ Our [Incident Report Handling Procedures](incident-process.md) describes how we
 
 The members and their terms are as follows:
 
-### Term ends on August 23, 2023
+### Term ends on August 23, 2025
 
 - Jeremy Rickard (Microsoft)
-- Jason DeTiberus (Cisco)
+- Ana Margarita Medina (Lightstep)
 
 ### Term ends on August 17, 2024
 
@@ -54,21 +71,4 @@ The members and their terms are as follows:
 
 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.
 
-## Emeritus Committee Members
-
-The Code of Conduct Committee sincerely thanks our emeritus committee members for their contributions.
-
-- Jaice Singer Dumars (Google)
-- Jennifer Rondeau (Stripe)
-- Carolyn Van Slyck (Microsoft)
-- Eric Paris (Red Hat)
-- Paris Pittman (Apple)
-- Aeva Black (Microsoft)
-- Tasha Drew (VMware)
-- Tim Pepper (VMware)
-- Karen Chu (Microsoft)
-- Celeste Horgan (Independent)
-- Carlos Tadeu Panato Jr. (Chainguard, Inc)
-- Vallery Lancey (Apple)
-
 <!-- END CUSTOM CONTENT -->

committee-code-of-conduct/election.md

@@ -42,12 +42,27 @@ Nominations can be collected via any means. In the past a Google form has been u
 * Does the nominee have any experience serving on an Ethics Committee or Code of Conduct Committee? (required)
 * How has this nominee demonstrated the [eligibility for candidacy](#eligibility-for-candidacy) guidelines? (optional)
 
-The nomination form must be communicated via email to [Kubernetes dev](https://groups.google.com/forum/#!forum/kubernetes-dev) mailing list.
+The nomination form must be communicated via email to [kubernetes-dev] mailing list.
 
 Prior to the voting process, Steering must:
 * Vet that all nominees support the role of the code of conduct committee, i.e. maintaining a safe and inclusive space for everyone to work on Kubernetes.
 * Confirm with all nominees (that were not self nominations) that they accept the nomination.
 
+#### Voting Process
+
+The steering committee will setup an election and ensure that the election is open for a duration such that all members can vote.
+
+Sample PR for setting up the election: https://github.com/kubernetes/community/pull/7446
+
+<!-- TODO(future): Discuss the possibility of surfacing candidate bios in public -->
+<!-- TODO(future): Discuss the possibility of candidates nominating through GitHub similar to the Steering Committee Elections -->
+
+#### Announcing Results
+
+Once the elections are over, the steering committee will re-confirm with the winning
+candidates their intent of serving in the committee and then only announce the
+election results to [kubernetes-dev] mailing list.
+
 ### Maximal representation
 
 Maximal representation of a single employer is `QUORUM - 1`. With a five person committee,
@@ -56,7 +71,7 @@ that limits the number of members employed by the same company to two.
 ### Election Cycles
 
 Election cycles are scheduled such that roughly half of the seats come up for
-re-election each year for purposes of continuity.  The exact number of seats
+re-election each year for purposes of continuity. The exact number of seats
 alternates between 2 and 3. The elections by the steering committee should be
 held and announced before the previous appointments expire (typically in Aug).
 
@@ -84,3 +99,5 @@ new special election will be held by the steering committee instead of filling
 with names from the previous election. Those elected will complete the remaining
 terms of the previous, dissolved, committee. With those receiving the highest
 votes receiving the longest term.
+
+[kubernetes-dev]: https://groups.google.com/a/kubernetes.io/g/dev

committee-security-response/README.md

@@ -22,6 +22,12 @@ The Kubernetes Security Response Committee is the body that is responsible for r
 * Rita Zhang (**[@ritazh](https://github.com/ritazh)**), Microsoft
 * Tabitha Sable (**[@tabbysable](https://github.com/tabbysable)**), Datadog
 
+## Emeritus Members
+
+* Luke Hinds (**[@lukehinds](https://github.com/lukehinds)**)
+* Swamy Shivaganga Nagaraju (**[@swamymsft](https://github.com/swamymsft)**)
+* Tim Allclair (**[@tallclair](https://github.com/tallclair)**)
+
 ## Contact
 - Private Mailing List: [email protected]
 - [Open Community Issues/PRs](https://github.com/kubernetes/community/labels/committee%2Fsecurity-response)

committee-steering/README.md

@@ -16,18 +16,18 @@ The [charter](https://git.k8s.io/steering/charter.md) defines the scope and gove
 *Joining the [mailing list](https://groups.google.com/a/kubernetes.io/forum/#!forum/steering) for the group will typically add invites for the following meetings to your calendar.*
 * Private Steering Committee Meeting: [third Mondays at 9:30 PT (Pacific Time)](https://bit.ly/k8s-steering-wd) (monthly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=9:30&tz=PT%20%28Pacific%20Time%29).
   * [Meeting recordings](https://www.youtube.com/watch?v=YAzgJRQxsdc&list=PL69nYSiGNLP1yP1B_nd9-drjoxp0Q14qM).
-* Public Steering Committee Meeting: [first Mondays at 9:30 PT (Pacific Time)](https://bit.ly/k8s-steering-wd) (monthly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=9:30&tz=PT%20%28Pacific%20Time%29).
+* Public Steering Committee Meeting: [first Wednesdays at 8:00 PT (Pacific Time)](https://bit.ly/k8s-steering-wd) (monthly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=8:00&tz=PT%20%28Pacific%20Time%29).
   * [Meeting recordings](https://www.youtube.com/watch?v=YAzgJRQxsdc&list=PL69nYSiGNLP1yP1B_nd9-drjoxp0Q14qM).
 
 ## Members
 
 * Benjamin Elder (**[@BenTheElder](https://github.com/BenTheElder)**), Google
-* Christoph Blecker (**[@cblecker](https://github.com/cblecker)**), Red Hat
-* Carlos Tadeu Panato Jr. (**[@cpanato](https://github.com/cpanato)**), Chainguard, Inc
 * Stephen Augustus (**[@justaugustus](https://github.com/justaugustus)**), Cisco
 * Bob Killen (**[@mrbobbytables](https://github.com/mrbobbytables)**), Google
+* Paco Xu 徐俊杰 (**[@pacoxu](https://github.com/pacoxu)**), DaoCloud
 * Nabarun Pal (**[@palnabarun](https://github.com/palnabarun)**), VMware
-* Tim Pepper (**[@tpepper](https://github.com/tpepper)**), VMware
+* Patrick Ohly (**[@pohly](https://github.com/pohly)**), Intel
+* Maciej Szulik (**[@soltysh](https://github.com/soltysh)**), Red Hat
 
 ## Contact
 - Slack: [#steering-committee](https://kubernetes.slack.com/messages/steering-committee)

committee-steering/governance/sig-governance.md

@@ -136,15 +136,40 @@ the acceptance of that SIG or Subproject.
 Additional information on the Tech Lead role can be found in
 [technical-lead.md]; within the [Chair & TL Contributor Documentation].
 
-#### Subproject Owner
+#### Subproject Lead
+
+**Note:** This is a generalized high-level description of the role, and the
+specifics of the subproject lead role's responsibilities and related
+processes *MUST* be defined for individual SIGs or subprojects. The process
+for becoming an Subproject Lead should be defined in the SIG charter of the
+SIG owning the subproject.
+
+Subproject Leads are the technical authority for a subproject in the Kubernetes
+project. They *MUST* have demonstrated both good judgement and responsibility
+towards the health of that subproject.
 
 - Number: 2+
-- Scoped to a subproject defined in [sigs.yaml]
-- Seed leads and contributors established at subproject founding
-- *SHOULD* be an escalation point for technical discussions and decisions in
-  the subproject
+- Membership tracked in [sigs.yaml] via *subproject.leads* entry and scoped to a subproject
+- *MUST* set technical direction and make or approve design decisions for their subproject - either directly or through delegation
+- *MUST* mentor and guide approvers, reviewers, and contributors to the subproject.
+- *MUST* maintain components, review, shepherd and approve proposals for enhancing areas owned by the subproject
+- *MUST* actively participate in triaging issues and reviewing PRs
+- *SHOULD* be an escalation point for technical discussions and decisions in the subproject
 - *SHOULD* set milestone priorities or delegate this responsibility
-- Membership tracked in [sigs.yaml] via links to OWNERS files
+- *SHOULD* ensure a healthy process for discussion and decision making is in place.
+- *MAY* make decisions to resolve conflicts
+
+#### Subproject Owner
+
+- *Optional if and only if Subproject Leads are defined for the subproject*
+  - Number: 2+
+  - Membership tracked in [sigs.yaml] via links to OWNERS files
+  - *If no Subproject Leads are defined for the subproject, the Subproject Owners will be responsible for the same duties.*
+- Scoped to a subproject defined in [sigs.yaml]
+- *MUST* actively participate in triaging issues and reviewing PRs
+- *SHOULD* mentor and guide contributors of the subproject
+- *SHOULD* help the subproject leads (if defined) in their responsibilities
+
 
 #### All Leads
 
@@ -175,7 +200,7 @@ governance requirements, including defining more roles to sustain the group. If
 a SIG needs to change the Chair and Tech Lead position to include or remove
 duties, this needs to be approved by the Steering Committee. Newly created roles
 that don't assume any responsibility of Chair and/or Tech Lead should follow
-the governing processes in the SIGs charter. 
+the governing processes in the SIGs charter.
 
 Example of SIG roles created to help operations:
 

communication/README.md

@@ -129,9 +129,9 @@ community call, and more [YouTube Guidelines].
 
 #### Kubernetes Blog
 
-The [Kubernetes Blog] is owned by sig-docs and operated by the [blog team].
+The [Kubernetes Blog] is owned by SIG Docs and operated by the [blog team].
 
-[submit a blog post] | [2018 blog metrics]
+[submit a blog post]
 
 ## Misc Community Resources
 ### Issues & Troubleshooting

communication/contributor-comms/CHARTER.md

@@ -18,25 +18,23 @@ This team operates independently from Cloud Native Computing Foundation (CNCF) o
 
 ## Governance
 
-The Contributor Comms subproject welcomes and encourages its members to take on leadership roles in their contributions. The group defines the areas of its work such as social media, blogging, etc. and creates associated leadership roles accordingly. Members are encouraged to pursue any interest in specific areas as contributing team members, leads, or shadows. Leadership roles are defined in the subproject’s [role handbooks](../role-handbooks/).
+The Contributor Comms subproject welcomes and encourages its members to take on leadership roles in their contributions. The group defines the areas of its work such as social media, blogging, etc. and creates associated leadership roles accordingly. Members are encouraged to pursue any interest in specific areas as contributing team members, leads, or shadows. Leadership roles are defined in the subproject’s [role handbooks](./role-handbooks/).
 
 ## Roles and Subproject Management
 
 General subproject leadership is handled by the Contributor Comms Subproject Lead(s). Specific subproject responsibilities are also broken down into areas with their own lead roles, as defined here:
 
-* Contributor Comms Subproject Lead
-* [Social Media Coordinator](../role-handbooks/Social-Media.md)
-* [Comms Tech Lead](../role-handbooks/Comms-Tech-Lead.md)
-* [Comms Event Lead](../role-handbooks/Comms-Event-Lead.md)
-* [Comms Blog Coordinator](../role-handbooks/blog-coordinator.md)
-* [Storytellers](../role-handbooks/storytellers.md) & other members
+* [Contributor Comms Subproject Lead](./role-handbooks/Subproject-Lead.md)
+* [Social Media Coordinator](./role-handbooks/Social-Media.md)
+* [Comms Tech Lead](./role-handbooks/Comms-Tech-Lead.md)
+* [Comms Blog Coordinator](./role-handbooks/blog-coordinator.md)
 * Emeritus (previous team members that we had the privilege of working with)
 
 All roles can have multiple shadows and should have at least one shadow. All leads should actively recruit members and shadows for the entire team.
 
 Roles are flexible and subject to change.
 
-Roles are occupied or available as indicated on our [README.md](https://github.com/kubernetes/community#readme).
+Roles are occupied or available as indicated on our [README.md](https://github.com/kubernetes/community/tree/master/communication/contributor-comms#readme).
 
 ### Decision Making
 

communication/contributor-comms/OWNERS

@@ -1,20 +1,20 @@
 # See the OWNERS docs at https://go.k8s.io/owners
 
 reviewers:
-  - Atharva-Shinde
   - AvineshTripathi
   - chris-short
   - fsmunoz
-  - imnmo
   - kaslin
+  - SD-13
 approvers:
-  - Atharva-Shinde
   - AvineshTripathi
   - chris-short
   - fsmunoz
-  - imnmo
   - kaslin
+  - SD-13
 emeritus_approvers:
+  - Atharva-Shinde
+  - imnmo
   - Pensu
   - mbbroberg
   - parispittman