From e27a91b66f912604aee5f30aa077f967a1cd0480 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 10:30:59 -0400 Subject: [PATCH 1/6] LF footer website guidelines https://github.com/cncf/foundation/blob/main/website-guidelines.md Signed-off-by: Lou DeGenaro --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index 050fae9..41f75fa 100644 --- a/README.md +++ b/README.md @@ -101,3 +101,12 @@ Consult [maintainers](MAINTAINERS.md) for the current list of maintainers for va # limitations under the License. ``` + +----- + +We are a Cloud Native Computing Foundation sandbox project. + +The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage)". + +*OSCAL Compass was originally contributed by IBM.* + From 1964aeadcbdf43220e10a9c6fecfda27c147e400 Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Fri, 30 Aug 2024 11:57:25 -0400 Subject: [PATCH 2/6] 2024 Signed-off-by: Lou DeGenaro --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 41f75fa..8362a06 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ If you would like to see the detailed LICENSE click [here](LICENSE). Consult [maintainers](MAINTAINERS.md) for the current list of maintainers for various projects in the oscal-compass community. ```text -# Copyright (c) 2020 The OSCAL Compass Authors. All rights reserved. +# Copyright (c) 2024 The OSCAL Compass Authors. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. From 213df7863c090d9b81c6d3274b39e30d2316996f Mon Sep 17 00:00:00 2001 From: Lou DeGenaro Date: Tue, 3 Sep 2024 18:11:09 -0400 Subject: [PATCH 3/6] Missing logo. Signed-off-by: Lou DeGenaro --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 8362a06..b35972c 100644 --- a/README.md +++ b/README.md @@ -106,6 +106,11 @@ Consult [maintainers](MAINTAINERS.md) for the current list of maintainers for va We are a Cloud Native Computing Foundation sandbox project. + + + + + The Linux Foundation® (TLF) has registered trademarks and uses trademarks. For a list of TLF trademarks, see [Trademark Usage](https://www.linuxfoundation.org/legal/trademark-usage)". *OSCAL Compass was originally contributed by IBM.* From dc4feb5f2072385394ec2b02ba1ebc23b538981d Mon Sep 17 00:00:00 2001 From: Jennifer Power Date: Tue, 10 Sep 2024 14:13:28 -0400 Subject: [PATCH 4/6] feat: add a GitVote profiles and instructions (#80) Signed-off-by: Jennifer Power --- .gitvote.yml | 17 +++++++++++++++++ GOVERNANCE.md | 24 +++++++++++++++++++----- 2 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 .gitvote.yml diff --git a/.gitvote.yml b/.gitvote.yml new file mode 100644 index 0000000..59b66f5 --- /dev/null +++ b/.gitvote.yml @@ -0,0 +1,17 @@ +profiles: + default: + duration: 4w + pass_threshold: 51 + periodic_status_check: "2 weeks" + close_on_passing: true + allowed_voters: + teams: + - oversight-committee-members + super: + duration: 4w + pass_threshold: 66 + periodic_status_check: "2 weeks" + close_on_passing: true + allowed_voters: + teams: + - oversight-committee-members \ No newline at end of file diff --git a/GOVERNANCE.md b/GOVERNANCE.md index b931576..32e1d76 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -72,15 +72,29 @@ In the event that consensus cannot be reached, a Maintainer can call for a vote ### Explicit Voting -The secondary decision-making process is done by explicit voting. +The secondary decision-making process is done by explicit voting. -#### Simple Majority Vote +#### Process -If a vote is called, the default is a simple majority vote - more than half of the appropriate deciding body. +We use the [GitVote](https://github.com/cncf/gitvote) bot to streamline our voting efforts. -#### Supermajority Vote +- Organization-level voting must take place in the community (this repository) repository. +- Only GitHub Issues and Pull Requests are supported. -In some cases, a supermajority vote is required for decision making - at least two-thirds of the appropriate deciding body. +The GitVote [repository](https://github.com/cncf/gitvote/blob/main/README.md) has additional information on usage. + +There are some constant configurations between voting profiles: + +- The Oversight Committee members have binding votes in the community repository. All in the community can and are encouraged to participate in the vote, even if their vote is not binding. +- The duration for voting is four weeks with status checks occurring at the two week mark. + +##### Simple Majority Vote + +If a vote is called, the default is a simple majority vote - more than half of the appropriate deciding body. This is the default profile used when calling a vote with `/vote` + +##### Supermajority Vote + +In some cases, a supermajority vote is required for decision making - at least two-thirds of the appropriate deciding body. You can use `/vote-super` to initiate this type of vote. Some examples include: From 3e099039afc12a6ab25425b0195419d16e49e2d1 Mon Sep 17 00:00:00 2001 From: Jennifer Power Date: Wed, 18 Sep 2024 14:50:47 -0400 Subject: [PATCH 5/6] docs: updates `MAINTAINER.md` with corrections (#82) Signed-off-by: Jennifer Power --- MAINTAINERS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/MAINTAINERS.md b/MAINTAINERS.md index 9736ed2..6077fba 100644 --- a/MAINTAINERS.md +++ b/MAINTAINERS.md @@ -12,6 +12,7 @@ The project-wide oversight committee - [`jpower432`](https://github.com/jpower432) - [`mrgadgil`](https://github.com/mrgadgil) - Chair - [`yuji-watanabe-jp`](https://github.com/yuji-watanabe-jp) +- [`vikas-agarwal76`](https://github.com/vikas-agarwal76) ### Org Admins @@ -23,6 +24,7 @@ Team with admin access to the `oscal-compass` org. - [`vikas-agarwal76`](https://github.com/vikas-agarwal76) - [`mrgadgil`](https://github.com/mrgadgil) - [`jflowers`](https://github.com/jflowers) +- [`degenaro`](https://github.com/degenaro) - [`thelinuxfoundation`](https://github.com/thelinuxfoundation) ## Community @@ -33,3 +35,4 @@ Team with maintainer access to the Community repository - [`jpower432`](https://github.com/jpower432) - [`vikas-agarwal76`](https://github.com/vikas-agarwal76) +- [`degenaro`](https://github.com/degenaro) From 11e271cd5f48d108ec4fe8c225a6847ca9e155bc Mon Sep 17 00:00:00 2001 From: Jennifer Power Date: Thu, 19 Sep 2024 08:17:08 -0400 Subject: [PATCH 6/6] docs: adds principles to the governance document (#77) Signed-off-by: Jennifer Power --- GOVERNANCE.md | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 32e1d76..bd261b5 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -2,6 +2,15 @@ The following document outlines how the OSCAL Compass project governance operates. +## Principles + +The OSCAL Compass community adheres to the following principles: + +**Open**: OSCAL-Compass is open source. See project guidelines [here](./CONTRIBUTING.md). +**Welcoming and respectful**: See [Code of Conduct](./CODE_OF_CONDUCT.md). +**Transparent and accessible**: Work and collaboration should be done in public. +**Merit**: Ideas and contributions are accepted according to their technical merit and alignment with project objectives, scope, and design principles. See our design proposal [process](./proposals/README.md) + ## Governance Structure Overview The OSCAL Compass Project has a two-level governance structure with an Oversight Committee and Project Maintainers. @@ -112,4 +121,4 @@ Trivial changes that do not introduce policy changes may be approved by two memb ## Acknowledgements -This governance approach and documentation was adapted from InstructLab [governance](https://github.com/instructlab/community/blob/main/GOVERNANCE.md). +Sections of this document were adapted from [InstructLab](https://github.com/instructlab/community/blob/main/GOVERNANCE.md) and [CoreDNS](https://github.com/coredns/coredns/blob/master/GOVERNANCE.md) projects.