Skip to content

Commit

Permalink
Merge branch 'main' into proposals/move-trestle-sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
jpower432 authored Sep 27, 2024
2 parents 7c7aef6 + 11e271c commit a4e3910
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 7 deletions.
17 changes: 17 additions & 0 deletions .gitvote.yml
Original file line number Diff line number Diff line change
@@ -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
35 changes: 29 additions & 6 deletions GOVERNANCE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -72,15 +81,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.

#### Process

We use the [GitVote](https://github.com/cncf/gitvote) bot to streamline our voting efforts.

- Organization-level voting must take place in the community (this repository) repository.
- Only GitHub Issues and Pull Requests are supported.

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
##### Simple Majority Vote

If a vote is called, the default is a simple majority vote - more than half of the appropriate deciding body.
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
##### Supermajority Vote

In some cases, a supermajority vote is required for decision making - at least two-thirds of the appropriate deciding body.
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:

Expand All @@ -98,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.
3 changes: 3 additions & 0 deletions MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand All @@ -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)
16 changes: 15 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -101,3 +101,17 @@ 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.

<picture>
<source media="(prefers-color-scheme: dark)" srcset="https://www.cncf.io/wp-content/uploads/2022/07/cncf-white-logo.svg">
<img src="https://www.cncf.io/wp-content/uploads/2022/07/cncf-color-bg.svg" width=300 />
</picture>

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.*

0 comments on commit a4e3910

Please sign in to comment.