diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index bbbbad7..6ddc594 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,6 +1,6 @@ # Microcks Community Code of Conduct -Microcks project adheres to the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md), aligning with the values of collaboration, transparency, and inclusivity that define open source. +Microcks project adheres to the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md), aligning with the values of collaboration, transparency, and inclusivity that define open source. ## Our Pledge @@ -21,12 +21,26 @@ To ensure a productive, positive experience for all community members, we ask ev ## Enforcement -Instances of unacceptable behavior—including harassment, abusive language, or any other forms of misconduct—should be reported to the Microcks project team at **info@microcks.io**. +Please do not report Code of Conduct incidents through public channels. + +Incidents occurring entirely within the Microcks community may be reported privately to the Microcks project team at [info@microcks.io](mailto:info@microcks.io). + +Reports may instead be submitted to the CNCF Code of Conduct Committee at [conduct@cncf.io](mailto:conduct@cncf.io), especially when: + +- A Microcks Maintainer or project-level incident responder is involved, +- A conflict of interest may prevent impartial project-level handling, +- The incident is project-agnostic or affects multiple CNCF projects, or +- The reporter prefers independent handling by CNCF. + +The CNCF [Incident Resolution Procedures](https://github.com/cncf/foundation/blob/main/code-of-conduct/coc-incident-resolution-procedures.md) explain what to include in a report, what happens after submission and how to report anonymously. Reports are handled or transferred according to the CNCF [Code of Conduct jurisdiction policy](https://github.com/cncf/foundation/blob/main/code-of-conduct/coc-committee-jurisdiction-policy.md). The project team will: + - Review and investigate all reports confidentially. -- Take action deemed appropriate for the situation, including potential temporary or permanent bans from the community. -- Keep the identity of the reporter confidential, ensuring a safe and respectful process for all involved. +- Take proportionate protective or remedial action within the project's jurisdiction and applicable CNCF policies. +- Protect the reporter's identity and share confidential information only when needed to investigate, resolve or transfer the incident, subject to the CNCF procedures and applicable law. +- Require anyone with a conflict of interest to recuse themselves from accessing confidential report information, investigating the incident or deciding its resolution. +- Transfer incidents to the CNCF Code of Conduct Committee when required by the CNCF jurisdiction policy. ## A Community-Driven Open Source diff --git a/GOVERNANCE.md b/GOVERNANCE.md index b9e82df..25291f4 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -101,7 +101,7 @@ Typically, disputes are resolved amicably by those involved through open discuss Here’s how to join and participate: https://github.com/microcks/community/blob/main/JOIN-OUR-MEETINGS.md -The maintainers will also have closed meetings to discuss security reports or Code of Conduct violations. Any maintainer in charge should schedule such meetings upon receiving a security issue or CoC report. All current Maintainers must be invited to such closed meetings, except for any maintainer accused of a CoC violation. +Maintainers may hold closed meetings when needed to handle security reports or Code of Conduct incidents. Participation is limited to people needed to respond who do not have a material conflict of interest. Any Maintainer who is accused, directly involved or otherwise conflicted must recuse themselves and must not receive confidential information about the incident except as required for a fair investigation. Code of Conduct reports are handled or transferred according to the reporting and escalation process in the [Code of Conduct](CODE_OF_CONDUCT.md). ## Steering Committee To support sustainable growth and ensure the project remains responsive to high-scale users, Microcks features a **Steering Committee (SC)**. The SC acts as a functional component of governance, focusing on strategic project orientation and incorporating the "adopter's voice" into the long-term roadmap. @@ -115,7 +115,7 @@ Changes to governance policy and any supporting governance documents require a f This Project Governance is a living document. As the Microcks community and project continue to evolve, maintainers are **committed** to improving and openly sharing our governance model, ensuring transparency and collaboration every step of the way. ## Code of Conduct -Microcks follow the [Code of Conduct](CODE_OF_CONDUCT.md), which is aligned with the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md). +Microcks follows the [Code of Conduct](CODE_OF_CONDUCT.md), which is aligned with the [CNCF Code of Conduct](https://github.com/cncf/foundation/blob/main/code-of-conduct.md). ## Credits Thanks to [Dawn Foster](https://github.com/geekygirldawn) for the inspiring talk and valuable insights at KubeCon Europe 2022: "Good Governance Practices for CNCF Projects":