Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions committee-code-of-conduct/charter.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,10 @@ recusal, quorum is 2.

### Policy change ratification
Any changes to the charter require explicit LGTM or Approve from all
committee members. For pull requests, a /hold will be applied until all
approvals are present. Any changes merged without consensus will be reverted.
code of conduct and steering committee members
(see the [SIG charter approval process](https://github.com/kubernetes/community/tree/master/committee-steering/governance#sig-charter-approval-process)).
For pull requests, a /hold will be applied until all approvals are present. Any changes merged without
consensus will be reverted.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks


### Incident report confidentiality
The Code of Conduct committee will keep your report confidential. The CoCC may
Expand Down Expand Up @@ -147,4 +149,12 @@ self-elected reason, they must notify the committee as well as the steering
committee in writing. As a courtesy, such notifications should be given at least
30 calendar days in advance of their departure.

### Participation in the Kubernetes steering committee
Participation in both of these committees represents a conflict of interest.
If a current code of conduct committee member chooses to run for the Kubernetes steering committee,
they are required to announce their resignation from the code of conduct committee upon the
announcement of their candidacy for steering (not after the election takes place). Their resignation
would then take effect on the date the steering election concludes to allow notice time for a replacement
member to be appointed.

Comment on lines +152 to +159
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we break this out into a separate PR? I don't think theres any debate on this part of it and we should ideally get it merged before the actual election kicks off :x

[email]: conduct@kubernetes.io