-
Notifications
You must be signed in to change notification settings - Fork 5.3k
update code of conduct charter to address other committee elections #6955
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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. | ||
|
|
||
| ### Incident report confidentiality | ||
| The Code of Conduct committee will keep your report confidential. The CoCC may | ||
|
|
@@ -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
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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 | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks