Skip to content

Commit

Permalink
fix: Update branch name to main, instead of master (cncf#608)
Browse files Browse the repository at this point in the history
Signed-off-by: Tom Kerkhove <[email protected]>
  • Loading branch information
tomkerkhove committed Feb 22, 2021
1 parent 51f72c6 commit e591429
Show file tree
Hide file tree
Showing 23 changed files with 75 additions and 75 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/annual-review-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Your annual review should answer the following questions:
[] How has the project performed against its goals since the last review? (We won't penalize you if your goals changed for good reasons.)
[] What are the current goals of the project? For example, are you working on major new features? Or are you concentrating on adoption or documentation?
[] How can the CNCF help you achieve your upcoming goals?
[] Do you think that your project meets the criteria for [incubation](https://github.com/cncf/toc/blob/master/process/graduation_criteria.adoc#incubating-stage)?
[] Do you think that your project meets the criteria for [incubation](https://github.com/cncf/toc/blob/main/process/graduation_criteria.adoc#incubating-stage)?
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/project-onboarding.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Welcome to CNCF Project Onboarding!
This is an issue created to help onboard your project into the CNCF after the TOC has voted to accept your project.

From the project side, please ensure that you:
- [ ] Understand the project proposal process and reqs: https://github.com/cncf/toc/blob/master/process/project_proposals.adoc#introduction
- [ ] Understand the project proposal process and reqs: https://github.com/cncf/toc/blob/main/process/project_proposals.adoc#introduction
- [ ] Understand the services available for your project at CNCF https://www.cncf.io/services-for-projects/
- [ ] Ensure your project meets the CNCF IP Policy: https://github.com/cncf/foundation/blob/master/charter.md#11-ip-policy
- [ ] Review the online programs guidelines: https://github.com/cncf/foundation/blob/master/online-programs-guidelines.md
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@

If you're interested in contributing a project to CNCF, please open up an issue here for discussion: https://github.com/cncf/toc/issues

The full project proposal process is located [here](https://github.com/cncf/toc/blob/master/process/project_proposals.adoc).
The full project proposal process is located [here](https://github.com/cncf/toc/blob/main/process/project_proposals.adoc).

## TOC Contributors

There has been a call from CNCF’s Technical Oversight Committee (TOC) for additional contributors and expertise to help evaluate potential projects and contribute to [CNCF SIGs](https://github.com/cncf/toc/blob/master/sigs/cncf-sigs.md) and [working groups](https://github.com/cncf/toc#working-groups). With the metaphor of the TOC as an open source project and the TOC [members](https://github.com/cncf/toc#members) as the maintainers, we are making a call for new **TOC Contributors**.
There has been a call from CNCF’s Technical Oversight Committee (TOC) for additional contributors and expertise to help evaluate potential projects and contribute to [CNCF SIGs](https://github.com/cncf/toc/blob/main/sigs/cncf-sigs.md) and [working groups](https://github.com/cncf/toc#working-groups). With the metaphor of the TOC as an open source project and the TOC [members](https://github.com/cncf/toc#members) as the maintainers, we are making a call for new **TOC Contributors**.

Possible ways to contribute:

Expand All @@ -18,12 +18,12 @@ Possible ways to contribute:
* CNCF SIGs & working groups (various tasks)
* Technical content for website

If you are interested in engaging in this way, we would encourage you to issue a pull request to [TOC Contributors](https://github.com/cncf/toc/blob/master/CONTRIBUTORS.md) that you desire to become a TOC Contributor. Although there is not an actual limit of having one Contributor per company, we would encourage CNCF member companies to designate an official TOC Contributor who is tasked with consulting internal experts and expressing a semi-official view on a given project. We will list current TOC Contributors on a page similar to https://www.cncf.io/people/ambassadors/.
If you are interested in engaging in this way, we would encourage you to issue a pull request to [TOC Contributors](https://github.com/cncf/toc/blob/main/CONTRIBUTORS.md) that you desire to become a TOC Contributor. Although there is not an actual limit of having one Contributor per company, we would encourage CNCF member companies to designate an official TOC Contributor who is tasked with consulting internal experts and expressing a semi-official view on a given project. We will list current TOC Contributors on a page similar to https://www.cncf.io/people/ambassadors/.

This is not only about individual contribution. It is also about rallying help from your employer, e.g., if you work for a CNCF Member company. Given the [breadth](https://landscape.cncf.io/) of projects represented by cloud native, it is impossible for anyone to be an expert in all technologies that we’re evaluating. We’re particularly interested in Contributors that can act as a focal point for tapping relevant expertise from their organizations and colleagues in order to engage with CNCF discussions in a timely manner.

The TOC already has the pattern of encouraging non-members to make non-binding votes, so no change in the TOC charter is necessary to allow Contributors.

TOC [meetings](https://github.com/cncf/toc#meeting-time) are only two hours a month, which are mainly taken up with project presentations. While Contributors are welcome to share their views during the meeting, the biggest opportunity is to comment on the TOC [mailing list](https://github.com/cncf/toc#mailing-list), on pull requests representing project applications and in voting.

And, just as the biggest contributors to open source projects often become maintainers, becoming an active TOC Contributor is one of the best paths to distinguish oneself ahead of TOC [elections](https://github.com/cncf/toc/blob/master/process/election-schedule.md).
And, just as the biggest contributors to open source projects often become maintainers, becoming an active TOC Contributor is one of the best paths to distinguish oneself ahead of TOC [elections](https://github.com/cncf/toc/blob/main/process/election-schedule.md).
2 changes: 1 addition & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# TOC Contributors

Find out more about the role of TOC contributors [here](https://github.com/cncf/toc/blob/master/CONTRIBUTING.md#toc-contributors)
Find out more about the role of TOC contributors [here](https://github.com/cncf/toc/blob/main/CONTRIBUTING.md#toc-contributors)

List below is the official list of TOC contributors, in alphabetical order:

Expand Down
20 changes: 10 additions & 10 deletions FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@ A FAQ geared towards CNCF TOC and project issues.
## How do I join the TOC?

The TOC is a body elected by a variety of constituents. There is a public election schedule:
https://github.com/cncf/toc/blob/master/process/election-schedule.md
https://github.com/cncf/toc/blob/main/process/election-schedule.md

The best way to get involved is to start attending TOC meetings and become an official TOC Contributor:
https://github.com/cncf/toc/blob/master/CONTRIBUTORS.md
https://github.com/cncf/toc/blob/main/CONTRIBUTORS.md

If you have specific focus areas, CNCF SIG meetings are good opportunity to dive in:
https://github.com/cncf/toc/tree/master/sigs
https://github.com/cncf/toc/tree/main/sigs

## What are CNCF SIGs?

The CNCF Special Interest Groups (SIGs) scale contributions by the CNCF technical and user community, while retaining integrity and increasing quality in support of our mission.

https://github.com/cncf/toc/tree/master/sigs
https://github.com/cncf/toc/tree/main/sigs

## What type of governance is my CNCF project expected to follow?

CNCF does not require its hosted projects to follow any specific governance model by default.

Instead, CNCF [specifies](https://github.com/cncf/toc/blob/master/process/graduation_criteria.adoc) that graduated projects need to "[e]xplicitly define a project governance and committer process."
Instead, CNCF [specifies](https://github.com/cncf/toc/blob/main/process/graduation_criteria.adoc) that graduated projects need to "[e]xplicitly define a project governance and committer process."

This varied and [open governance](https://github.com/opengovernance/opengovernance.dev) approach has led to different projects defining what is best and optimized for their community:

* https://github.com/containerd/project/blob/master/GOVERNANCE.md
* https://github.com/coredns/coredns/blob/master/GOVERNANCE.md
* https://github.com/envoyproxy/envoy/blob/master/GOVERNANCE.md
* https://github.com/envoyproxy/envoy/blob/main/GOVERNANCE.md
* https://github.com/helm/community/blob/master/governance/governance.md
* https://github.com/kubernetes/community/blob/master/governance.md
* https://prometheus.io/governance/
Expand All @@ -43,16 +43,16 @@ Neither the CNCF Governing Board (GB) nor the Technical Oversight Committee (TOC

Instead, the maintainers of those projects manage them; this includes defining the governance process. The GB is responsible for the budget.

TOC members are available to provide guidance and conflict resolution if desired to the projects but do not control them. The TOC also helps mature projects through the various CNCF project maturity levels to ensure projects meet the expected [graduation criteria](https://github.com/cncf/toc/blob/master/process/graduation_criteria.adoc). To date, we have had no meaningful disagreements between the TOC and project maintainers.
TOC members are available to provide guidance and conflict resolution if desired to the projects but do not control them. The TOC also helps mature projects through the various CNCF project maturity levels to ensure projects meet the expected [graduation criteria](https://github.com/cncf/toc/blob/main/process/graduation_criteria.adoc). To date, we have had no meaningful disagreements between the TOC and project maintainers.

Please see the [TOC Principles](https://github.com/cncf/toc/blob/master/PRINCIPLES.md) for more details.
Please see the [TOC Principles](https://github.com/cncf/toc/blob/main/PRINCIPLES.md) for more details.

## What type of support do CNCF projects receive?

The CNCF provides a variety of services that are accessible by maintainers via the ServiceDesk: https://github.com/cncf/servicedesk

## What is the definition of an end user?
End user companies use [cloud native](https://github.com/cncf/toc/blob/master/DEFINITION.md) technologies internally, but do not sell any cloud native services externally. Examples of end user companies are Adidas, Apple, Capital One, Spotify, and The New York Times. Examples of cloud native vendors (and so not end users) include cloud providers (e.g., Alibaba Cloud, AWS, Google Cloud, Microsoft Azure), consulting firms (e.g., Accenture, Booz Allen), infrastructure software vendors (e.g., SUSE, Red Hat), and telecom operators (e.g., AT&T, China Mobile).
End user companies use [cloud native](https://github.com/cncf/toc/blob/main/DEFINITION.md) technologies internally, but do not sell any cloud native services externally. Examples of end user companies are Adidas, Apple, Capital One, Spotify, and The New York Times. Examples of cloud native vendors (and so not end users) include cloud providers (e.g., Alibaba Cloud, AWS, Google Cloud, Microsoft Azure), consulting firms (e.g., Accenture, Booz Allen), infrastructure software vendors (e.g., SUSE, Red Hat), and telecom operators (e.g., AT&T, China Mobile).

If you’re not sure if your company is an end user, please compare the members of the [CNCF end user community](https://landscape.cncf.io/enduser=yes&format=card-mode) to the [vendor members](https://landscape.cncf.io/category=cncf-members&enduser=no&format=card-mode&grouping=category) of CNCF and find your company or one similar to yours in one group or the other. Or, you can email [email protected] and we’ll help you.

Expand All @@ -66,7 +66,7 @@ CNCF uses revenues from events first and foremost to cover the cost of events. T

## Does CNCF make decisions based on “pay-to-play” considerations?

**No**. CNCF’s charter [Section 3(c)](https://github.com/cncf/foundation/blob/master/charter.md) explicitly calls out fairness as a core value and requires us to ‘avoid undue influence, bad behavior or “pay-to-play” decision-making.’ Also projects are [openly governed](https://www.cncf.io/blog/2019/08/30/cncf-technical-principles-and-open-governance-success/) and technical participation never requires any form of membership. The correct way to view this is that CNCF members **PAY TO SUSTAIN** and govern the shared budget which goes to sustain project activities such as events,scholarships and security audits.
**No**. CNCF’s charter [Section 3(c)](https://github.com/cncf/foundation/blob/main/charter.md) explicitly calls out fairness as a core value and requires us to ‘avoid undue influence, bad behavior or “pay-to-play” decision-making.’ Also projects are [openly governed](https://www.cncf.io/blog/2019/08/30/cncf-technical-principles-and-open-governance-success/) and technical participation never requires any form of membership. The correct way to view this is that CNCF members **PAY TO SUSTAIN** and govern the shared budget which goes to sustain project activities such as events,scholarships and security audits.

## Does membership or sponsorship level ever affect project-related decisions?

Expand Down
4 changes: 2 additions & 2 deletions PRINCIPLES.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ In the GitHub era, open projects are able to get a lot “done” without outsid
- But: we do not want to impose bureaucracy on projects because that will slow them down.
- Minimal viable governance also means that the TOC does not step in at a tactical level to overrule project leads’ decisions.
- There are some basics like [Code of Conduct](https://github.com/cncf/foundation/blob/master/code-of-conduct.md) - see Draft Statement below. Including dealing with problematic leads & maintainers.
- There is a formal & regulated system of [Graduation Criteria](https://github.com/cncf/toc/blob/master/process/graduation_criteria.adoc) for CNCF Projects
- There is a formal & regulated system of [Graduation Criteria](https://github.com/cncf/toc/blob/main/process/graduation_criteria.adoc) for CNCF Projects
- The TOC/CNCF want the ability to intervene if things go really wrong - i.e., project leads are stuck and cannot fix things.
- Provide a template for new projects, a set of best practices to help jump-start the task of setting up a new project.

Expand Down Expand Up @@ -76,7 +76,7 @@ _Principles:_

Via the “no kingmakers” principle and “what is a project”, the CNCF may support several projects which show how a ‘stack’ is a solution to certain use cases. For example, some stacks might use a container orchestrator. Other stacks might show how to integrate monitoring with other “observability” technologies, for cloud native apps regardless of their orchestration model.

This means that the CNCF is not promoting a single, monolithic stack of technologies.
This means that the CNCF is not promoting a single, monolithic stack of technologies.

CNCF projects may have dependencies on other open source projects that comply with the [CNCF IP policy](https://github.com/cncf/foundation/blob/master/allowed-third-party-license-policy.md), which may be outside the CNCF. Widely-used dependencies are preferred; pluggable dependencies fit well with our principles but are not essential. _Examples: Kubernetes' dependency on etcd, which was not a CNCF project at the time Kubernetes was brought into the CNCF; CNI, which enables pluggable networking dependencies._

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ See the [current CNCF projects](https://www.cncf.io/projects/) and a description

The CNCF provides a [list of services](https://www.cncf.io/services-for-projects/) for incubating and graduated projects hosted in the foundation. A subset of these services is also available for [Sandbox](https://www.cncf.io/sandbox-projects/) level projects.

Do you want to contribute to a project? We have [outlined the process](https://github.com/cncf/toc/blob/master/process/README.md) to get started. If you have any questions or don't know where to start, please open an [issue](https://github.com/cncf/toc/issues).
Do you want to contribute to a project? We have [outlined the process](https://github.com/cncf/toc/blob/main/process/README.md) to get started. If you have any questions or don't know where to start, please open an [issue](https://github.com/cncf/toc/issues).

## Meeting Time

Expand Down
4 changes: 2 additions & 2 deletions process/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Project progression, movement from one stage to another, allows projects to part

CNCF projects have a maturity level of sandbox, incubating, or graduated. Archived is for projects no longer in active development. The maturity level is a signal by CNCF as to what sorts of enterprises should be adopting different projects. Projects increase their maturity by demonstrating their sustainability to CNCF’s Technical Oversight Committee: that they have adoption, a healthy rate of changes, committers from multiple organizations, have adopted the CNCF Code of Conduct, and have achieved and maintained the Core Infrastructure Initiative Best Practices Badge.

![Project Stages](https://github.com/cncf/toc/blob/master/process/project-stages.png)
![Project Stages](https://github.com/cncf/toc/blob/main/process/project-stages.png)

## Sandbox:

Expand Down Expand Up @@ -68,7 +68,7 @@ To be accepted to incubating stage, a project must meet the sandbox stage requir
* A clear versioning scheme.
* Specifications must have at least one public reference implementation.

![Incubating](https://github.com/cncf/toc/blob/master/process/incubation-process.png)
![Incubating](https://github.com/cncf/toc/blob/main/process/incubation-process.png)

Projects currently in progress for consideration at the Incubating stage are tracked: https://github.com/cncf/toc/projects/7

Expand Down
2 changes: 1 addition & 1 deletion process/archiving.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@ What does archiving for a CNCF project mean?

## Reactivating an Archived Project

Any project can be reactivated into CNCF by following the normal project [proposal](https://github.com/cncf/toc/blob/master/process/project_proposals.adoc) and/or [sandbox](https://github.com/cncf/toc/blob/master/process/sandbox.md) process.
Any project can be reactivated into CNCF by following the normal project [proposal](https://github.com/cncf/toc/blob/main/process/project_proposals.adoc) and/or [sandbox](https://github.com/cncf/toc/blob/main/process/sandbox.md) process.
2 changes: 1 addition & 1 deletion process/dd-review-template.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Due Diligence Project Review Template
This page provides a template to help those leading or contributing to due diligence exercises performed by or on behalf of the Technical Oversight Committee of the CNCF. Please also read the [Due Diligence Guidelines](https://github.com/cncf/toc/blob/master/process/due-diligence-guidelines.md).
This page provides a template to help those leading or contributing to due diligence exercises performed by or on behalf of the Technical Oversight Committee of the CNCF. Please also read the [Due Diligence Guidelines](https://github.com/cncf/toc/blob/main/process/due-diligence-guidelines.md).

## Introduction
The decision to graduate or promote a project depends on the TOC sponsors of the project performing and documenting the evaluation process in deciding upon initial or continued inclusion of projects through a Technical Due Diligence ('Tech DD') exercise. Ultimately the voting members of the TOC will, on the basis of this and other information, vote for or against the inclusion of each project at the relevant time.
Expand Down
Loading

0 comments on commit e591429

Please sign in to comment.