Update OpenGitOps project governance to reflect GitOps WG merging

CHAIRS.md

@@ -0,0 +1,11 @@
+# Current Chairs
+
+Name | Organization | GitHub
+-- | -- | --
+Dan Garfield | Codefresh | [@todaywasawesome](https://github.com/todaywasawesome)
+Scott Rigby | Weaveworks | [@scottrigby](https://github.com/scottrigby)
+Chris Short | AWS | [@chris-short](https://github.com/chris-short)
+
+## Past Chairs
+
+- Leonardo Murillo, [@murillodigital](https://github.com/murillodigital)

GOVERNANCE.md

@@ -1,50 +1,42 @@
 # Governance
 
-This document defines the governance process for the GitOps Working Group and community and OpenGitOps project.
+This document defines the governance process for the OpenGitOps project and community.
 
 ## Roles
 
-### All Members
+### Community Members
 
-This is an open public working group welcoming anyone who would like to join and help.
-There are no special requirements for membership apart from the responsibilities listed  below.
-Members are not required to have any explicit roles or additional responsibilities, but they may also have formally assigned roles (see below).
-See the Working Group [README](README.md) for information about volunteering for committees and projects.
+OpenGitOps is an open public project welcoming anyone who would like to get involved.
+There are no special requirements for community membership apart from the responsibilities listed  below.
+Community members are not required to have any explicit roles or additional responsibilities, but they may also have formally assigned roles (see below).
+See the project [README](README.md) for information about volunteering for teams and project deliverables.
 Note that voting requires additional conditions (see [Elections](#elections)).
 
 Responsibilities:
 
 - Must follow the [Code of Conduct](https://github.com/open-gitops/.github/blob/main/CODE_OF_CONDUCT.md)
-- May not create the impression that they have any authority or formal responsibilities within the GitOps WG other than their explicitly assigned roles
+- May not create the impression that they have any authority or formal responsibilities within the OpenGitOps project other than their explicitly assigned roles
 
-### Committees
+### Team Members
 
-Working Group [Members](#all-members) may volunteer to join WG Committees and help with specific projects according to their interest and ability.
-Responsibilities vary per committee, but in general please remember everyone is a volunteer.
-Committees follow processes to allow for progress so long as they maintain inclusiveness, transparency, and respect for all involved.
+OpenGitOps [Community members](#community-members) may volunteer to join teams and help with specific projects according to their interest and ability.
+Responsibilities vary per team, but in general please remember everyone is a volunteer.
+Teams follow processes to allow for progress so long as they maintain inclusiveness, transparency, and respect for all involved.
 
-Current WG committees:
-
-- Principles Committee
-  - Responsible for drafting the revised [GitOps Principles](https://github.com/open-gitops/documents)
-- Events Committee
-  - Responsible for organizing events such as GitOpsCon, and supporting other events in the wider GitOps community (see [OpenGitOps events](https://opengitops.dev/events))
-- Communications Committee
-  - Reponsible for coordinating public communications on behalf of the working group
+For a list of current teams and members, see [TEAMS.md](./TEAMS.md).
 
 ### Maintainers
 
-Working Group and OpenGitOps project Maintainers are [Members](#all-members) who have shown significant and sustained contributions in the GitOps WG.
-The initial set of Maintainers were drawn from the organizations that proposed the creation of the working group.
+OpenGitOps project Maintainers are [Team Members](#team-members) who have shown significant and sustained contributions to the project.
 Maintainers must remain active in the project.
 Current Maintainers are listed in a [MAINTAINERS](./MAINTAINERS) file at the root of this git repository.
 
 Responsibilities:
 
-- Collectively care for the OpenGitOps project, as outlined in the [GitOps WG charter](https://github.com/cncf/tag-app-delivery/blob/main/gitops-wg/charter.md) Mission and Goals
-- Enable and promote GitOps Working Group community values
-- Engage with the wider GitOps community through appropriate [communication channels](https://github.com/cncf/tag-app-delivery/blob/main/gitops-wg/README.md#community)
-- Maintain involvement and open collaboration with working group members and committees
+- Collectively care for the OpenGitOps project, as outlined in the [Mission](./README.md#mission)
+- Enable and promote OpenGitOps community values
+- Engage with the wider GitOps community through appropriate [communication channels](https://github.com/open-gitops/.github/blob/main/CONTRIBUTING.md#discuss)
+- Maintain involvement and open collaboration with community members and teams
 - Review and approve pull requests
 - Participate in voting when needed
 - Ask for help when unsure
@@ -53,7 +45,7 @@ Responsibilities:
 
 Ultimately the Maintainers - after consulting with the community - drive the direction, values and governance of the overall project.
 
-The GitHub `@gitops-working-group/maintainers` team will be kept up to date with current Maintainers.
+The `@open-gitops/maintainers` GitHub team will be kept up to date with current Maintainers.
 
 ### Inactive Maintainers
 
@@ -65,25 +57,25 @@ See [Moving a Maintainer to Inactive](#moving-a-maintainer-to-inactive) for proc
 
 ### Chairs
 
-The GitOps WG and OpenGitOps project will be co-chaired by 3 [Maintainers](#maintainers).
+The OpenGitOps project will be co-chaired by 3 [Maintainers](#maintainers).
 A maximum of one person from any one entity may hold a chair role at any given moment in order to avoid undue influence, and maintain balanced representation.
-Current chairs are listed in a [CHAIRS.md](https://github.com/cncf/tag-app-delivery/blob/main/gitops-wg/CHAIRS.md) file in the GitOps Working Group directory of the CNCF App Delivery TAG git repository.
+Current chairs are listed in a [CHAIRS.md](./CHAIRS.md) file at the root of this git repository.
 
 Responsibilities:
 
-- Ensure the promotion of continued open involvement for the working group
-- Ensure that meetings and other activities are conducted and progress continues to be made against the project agenda, while also engaging other group members in leadership roles
+- Ensure the promotion of continued open involvement for the OpenGitOps project
+- Ensure that meetings and other activities are conducted and progress continues to be made against the project agenda, while also engaging other community members
 - Ensure discussion is extended asynchronously to be inclusive of members who cannot attend a specific meeting time
 - Schedule discussion of proposals that have been submitted
-- Partner with Maintainers and other WG members to establish a roadmap and manage ongoing projects
+- Partner with project Maintainers and other [Team Members](#team-members) to establish a roadmap and manage ongoing projects
 - Ask for new proposals to be made to address an identified needs
 - Have GitOps domain knowledge
-- Engage deeply in the work being done by the working group - that is, the role is not purely administrative.
-  Chairs are, however not responsible for performing all of the work - this is shared across the working group members and expected from those who have volunteered onto various workstreams.
-- When necessary, handle human and technical coordination across different working group workstreams
+- Engage deeply in the work being done by the OpenGitOps project - that is, the role is not purely administrative.
+  Chairs are, however not responsible for performing all of the work - this is shared across the OpenGitOps project members and expected from those who have volunteered onto various workstreams.
+- When necessary, handle human and technical coordination across different project workstreams
 - Handle Code of Conduct violations
 
-The GitHub `@gitops-working-group/chairs` team will be kept up to date with current chairs.
+The `@open-gitops/chairs` GitHub team will be kept up to date with current chairs.
 
 ## Elections
 
@@ -95,8 +87,8 @@ Before each election, there will be a call for nominations on the mailing list.
 Nominations should be sent to the mailing list, and include a brief bio and personal statement describing the candidate's qualifications to serve in this capacity.
 Self-nominations are welcome. Only existing [Maintainers](#maintainers) are eligible for nomination.
 
-The GitOps WG employs "organization voting" to ensure no single organization can dominate the election process or project.
-Up to two individuals from organizations who are both active members of the CNCF and listed in the [interested parties](https://github.com/cncf/tag-app-delivery/blob/main/gitops-wg/interested-parties.md) may vote.
+The OpenGitOps project employs "organization voting" to ensure no single organization can dominate the election process or project.
+Up to two individuals from a single organization who are both active members of the CNCF and listed in the [interested parties](./interested-parties.md) may vote.
 Interested parties must be added at least one week before any election to have a vote.
 Chairs will be elected using Ranked Choice Voting.
 
@@ -128,10 +120,10 @@ After they do so, they must be moved from the inactive section of the maintainer
 
 ### Decision Guidelines
 
-- The GitOps Working Group believes that the best decisions are reached through Consensus <https://en.wikipedia.org/wiki/Consensus_decision-making>.
-  This applies to all working communication by WG members (see [GitOps WG community info](https://github.com/cncf/tag-app-delivery/blob/main/gitops-wg/README.md#community)).
+- The OpenGitOps project believes that the best decisions are reached through Consensus <https://en.wikipedia.org/wiki/Consensus_decision-making>.
+  This applies to all working [communication](https://github.com/open-gitops/.github/blob/main/CONTRIBUTING.md#discuss) by [Team Members](#team-members)
 - Most decisions begin by seeking Lazy Consensus <https://communitymgt.wikia.com/wiki/Lazy_consensus>.
-- If an objection is raised through the Lazy Consensus process, the group works together to seek an agreeable solution.
+- If an objection is raised through the Lazy Consensus process, the Team Members work together to seek an agreeable solution.
 - If Consensus can not be reached, but a decision must be made, a vote among [Maintainers](#maintainers) will be called.
   This should only be done at this stage if:
   1. A Maintainer feels an important deadline is threatened by continuing the Consensus process; or

README.md

@@ -2,6 +2,8 @@
 <!-- markdownlint-disable MD033 -->
 <p><img src="https://raw.githubusercontent.com/cncf/artwork/master/projects/opengitops/icon/color/opengitops-icon-color.svg" alt="OpenGitOps logo icon color" width="150"></p>
 
+## Mission
+
 Welcome!
 OpenGitOps is a [CNCF Sandbox project](https://www.cncf.io/sandbox-projects/) to define a vendor-neutral, principle-led meaning of GitOps.
 This will establish a foundation for interoperability between tools, conformance, and certification through lasting programs, documents, and code.
@@ -19,12 +21,9 @@ This will establish a foundation for interoperability between tools, conformance
 
 ## Contributing
 
+OpenGitOps is an open public project welcoming anyone who would like to get involved.
 Be sure to review the OpenGitOps [contributing guidelines](https://github.com/open-gitops/.github/blob/main/CONTRIBUTING.md) and [code of conduct](https://github.com/open-gitops/.github/blob/main/CODE_OF_CONDUCT.md).
 
-OpenGitOps is currently guided by the CNCF [GitOps Working Group](https://github.com/cncf/tag-app-delivery/tree/main/gitops-wg), a WG under the CNCF [App Delivery TAG](https://github.com/cncf/tag-app-delivery).
-It is an open public working group welcoming anyone who would like to join and help.
-See [How to Get Involved](https://github.com/cncf/tag-app-delivery/tree/main/gitops-wg#community).
-
 ## Security
 
 Reporting a security vulnerability?

TEAMS.md

@@ -2,17 +2,17 @@
 
 ## What and why
 
-Community interest in GitOps, the GitOps Working Group (WG), and OpenGitOps project has continued to increase over the past several years. The WG is now large enough – and there are enough work products the group is committed to – that the project work can not all be organized within the all-group twice-monthly meeting. Often these areas of focus will be worked on by only a subset of the WG. Subgroups – or teams – have been a very functional solution to helping this work happen in a focused way while keeping the group on track. Every twice-monthly all-group meeting starts with a report by each of the teams, including new members. This could include you!
+Community interest in GitOps and OpenGitOps project has continued to increase over the past several years. The OpenGitOps community is now large enough – and there are enough work products committed to – that the project work can not all be organized within the twice-monthly project meeting. Often these areas of focus will be worked on by only a subset of contributors. Teams have been a very functional solution to helping this work happen in a focused way while keeping the project as a whole on track. Every twice-monthly project meeting starts with a report by each of the teams, including new members. This could include you!
 
 ## Process
 
-To join an existing team - [listed below](#list-of-teams) - it's a good idea to start by joining the twice monthly [GitOps WG meeting](https://zoom.us/j/93779536510?pwd=TEFzbGRzREI3MVlkZmluemVkMEhHdz09) (1st and 3rd Wednesday - 19:00 GMT) and introduce yourself. You may skip this if you are unable to join those meetings. In either case, for transparency, open a PR adding yourself to the list below in [this file](./TEAMS.md), and in the PR description explain which team(s) you want to volunteer to join and why. All legitimate volunteers who are able to continue contributing are welcome to join any team. Once the PR is approved, the user should be added to the appropriate GitHub team in the [open-gitops](https://github.com/open-gitops) GitHub org as a last step before the PR is merged. New team members should be added to the the next [GitOps WG twice-monthly meeting agenda](https://docs.google.com/document/d/1hxifmCdOV5_FbKloDJRWZQHq0ge-trXJKF-BgV4wHVk/edit) so they can be welcomed by the group. 🦄
+To join an existing team - [listed below](#list-of-teams) - it's a good idea to start by joining the twice monthly [project meeting](https://zoom.us/j/93779536510?pwd=TEFzbGRzREI3MVlkZmluemVkMEhHdz09) (1st and 3rd Wednesday - 19:00 GMT) and introduce yourself. You may skip this if you are unable to join those meetings. In either case, for transparency, open a PR adding yourself to the list below in [this file](./TEAMS.md), and in the PR description explain which team(s) you want to volunteer to join and why. All volunteers who are able to continue contributing are welcome to join any team. Once the PR is approved, the user should be added to the appropriate GitHub team in the [open-gitops](https://github.com/open-gitops) GitHub org as a last step before the PR is merged. New team members should be added to the next [project meeting agenda](https://docs.google.com/document/d/1hxifmCdOV5_FbKloDJRWZQHq0ge-trXJKF-BgV4wHVk/edit) so they can be welcomed to the project. 🦄
 
 To propose a new team, open a discussion topic in the [github.com/open-gitops/project](https://github.com/open-gitops/project) repo, make a persuasive case, and invite feedback from others. If it's deemed within the scope of the WG, and there are others interested in contributing, from there a PR can be opened to create the team and add members in this file, below.
 
-The status of proposed groups can be `proposed`, `active`, `paused`, or `inactive`. Be sure to keep the list below updated with a link to the currrent discussion, and active teams should have a link to meeting info for transparency and so anyone will be able to join if they wish.
+The status of proposed teams can be `proposed`, `active`, `paused`, or `inactive`. Be sure to keep the list below updated with a link to the currrent discussion, and active teams should have a link to meeting info for transparency and so anyone will be able to join if they wish.
 
-Please [reach out in any of the available ways](https://github.com/open-gitops/.github/blob/main/CONTRIBUTING.md) with any questions. We welcome contributions from [everyone](https://github.com/open-gitops/project/blob/main/GOVERNANCE.md#all-members), and look forward to collaborating with you! 🙂💖🤝
+Please [reach out in any of the available ways](https://github.com/open-gitops/.github/blob/main/CONTRIBUTING.md) with any questions. We welcome contributions from [everyone](https://github.com/open-gitops/project/blob/main/GOVERNANCE.md#community-members), and look forward to collaborating with you! 🙂💖🤝
 
 ## List of teams
 
@@ -23,7 +23,7 @@ Please [reach out in any of the available ways](https://github.com/open-gitops/.
 | -- | -- | -- | -- |
 | content/gitops-environmental-sustainability team | active | [current discussion](https://github.com/open-gitops/project/issues/129) | <ul><li>[@chris-short](https://github.com/chris-short)</li><li>[@JaimeMagiera](https://github.com/JaimeMagiera)</li><li>[@nikimanoledaki](https://github.com/nikimanoledaki)</li><li>[@niklasmtj](https://github.com/niklasmtj)</li><li>[@nishadmehendale](https://github.com/nishadmehendale)</li><li>[@scottrigby](https://github.com/scottrigby)</li><li>[@williamcaban](https://github.com/williamcaban)</li><li>[@Al-HusseinHameedJasim](https://github.com/Al-HusseinHameedJasim)</li></ul> |
 | marketing/media | active | [current discussion](https://github.com/open-gitops/project/discussions/22) | <ul><li>[@christianh814](https://github.com/christianh814)</li><li>[@chris-short](https://github.com/chris-short)</li><li>[@scottrigby](https://github.com/scottrigby)</li><li>[@soschwei](https://github.com/soschwei)</li><li>[@staceypotter](https://github.com/staceypotter)</li><li>[@todaywasawesome](https://github.com/todaywasawesome)</li></ul> |
-| marketing/events | active | [purpose](https://github.com/open-gitops/project/blob/main/GOVERNANCE.md#committees) (also see [#151](https://github.com/open-gitops/project/issues/151)) | <ul><li>[@christianh814](https://github.com/christianh814)</li><li>[@niklasmtj](https://github.com/niklasmtj)</li><li>[@roberthstrand](https://github.com/roberthstrand)</li><li>[@scottrigby](https://github.com/scottrigby)</li><li>[@soschwei](https://github.com/soschwei)</li><li>[@staceypotter](https://github.com/staceypotter)</li></ul> |
+| marketing/events | active | [purpose](https://github.com/open-gitops/project/blob/main/GOVERNANCE.md#team-members) (also see [#151](https://github.com/open-gitops/project/issues/151)) | <ul><li>[@christianh814](https://github.com/christianh814)</li><li>[@niklasmtj](https://github.com/niklasmtj)</li><li>[@roberthstrand](https://github.com/roberthstrand)</li><li>[@scottrigby](https://github.com/scottrigby)</li><li>[@soschwei](https://github.com/soschwei)</li><li>[@staceypotter](https://github.com/staceypotter)</li></ul> |
 
 ## Proposed teams