From 5bb8cedb9aa55b7e6a31ff8ada9ffae6aed0747d Mon Sep 17 00:00:00 2001 From: Ali Ok Date: Sat, 3 Feb 2024 23:44:04 +0300 Subject: [PATCH 1/2] TM committee dissolving --- BRANDING.MD | 14 ++- CALENDAR.MD | 3 +- GOVERNANCE.md | 11 +- README.md | 1 - REPOSITORY-GUIDELINES.md | 6 +- STEERING-COMMITTEE.md | 5 +- TECH-OVERSIGHT-COMMITTEE.md | 3 + TRADEMARK-COMMITTEE.md | 154 ------------------------- groups/committee-trademark/OWNERS | 6 - groups/committee-trademark/groups.yaml | 16 --- groups/restrictions.yaml | 3 - mechanics/GDRIVE.md | 1 - mechanics/SC.md | 2 +- mechanics/TOC.md | 2 +- peribolos/knative-OWNERS_ALIASES | 4 - peribolos/knative.yaml | 7 -- 16 files changed, 23 insertions(+), 215 deletions(-) delete mode 100644 TRADEMARK-COMMITTEE.md delete mode 100644 groups/committee-trademark/OWNERS delete mode 100644 groups/committee-trademark/groups.yaml diff --git a/BRANDING.MD b/BRANDING.MD index afd57798..3ca38d23 100644 --- a/BRANDING.MD +++ b/BRANDING.MD @@ -18,7 +18,8 @@ trademark law. Given the open nature of Knative, you may use the Knative trademark to refer to the project without prior written permission in accordance with these -guidelines. Please contact the Knative Trademark Committee if your proposed use case does not fall within these pre-approved categories. +guidelines. Please contact the [Knative Steering Committee](https://github.com/knative/community/blob/main/STEERING-COMMITTEE.md#getting-in-touch) +if your proposed use case does not fall within these pre-approved categories. Examples of approved references include the following: @@ -43,7 +44,8 @@ Suggested templates: * The Knative name may not be used or registered in a manner that would cause confusion as to the CNCF’s affiliation or endorsement (as the trademark owner). * Don't use the Knative name as part of your company name, product name, - domain name, or social media profile unless explicitly approved in advance by the Knative Trademark Committee. + domain name, or social media profile unless explicitly approved in advance by the + [Knative Steering Committee](https://github.com/knative/community/blob/main/STEERING-COMMITTEE.md#getting-in-touch). * Other than as permitted by these guidelines, the Knative name should not be combined with other trademarks, terms, or source identifiers. * Don't remove, distort or alter any element of the Knative Trademarks without @@ -68,14 +70,14 @@ Suggested templates: promotional materials should also prominently disclaim any official affiliation with or endorsement by Google and the Knative project. * Don't use the Knative logo on product UI, or promotional materials without - the Knative trademark owner’s prior written permission. The Knative - [Trademark Committee](https://github.com/knative/community/blob/main/TRADEMARK-COMMITTEE.md#getting-in-touch) + the Knative trademark owner’s prior written permission. The + [Knative Steering Committee](https://github.com/knative/community/blob/main/STEERING-COMMITTEE.md#getting-in-touch) will coordinate any communications with the trademark owner. * You may use the Knative name or logo for non-commercial swag purposes. * Don't use the Knative name or logo to indicate that your design or implementation is compatible with Knative without prior written permission. -The Knative Trademark Committee understands the community desire for a +The Knative Steering Committee understands the community desire for a conformance standard, and we do plan to implement one at a future date. We also recognize that conformance is a complicated issue with many variables, and it is still early days for the Knative project. For comparison, the @@ -85,7 +87,7 @@ is to have a Conformance Working Group created soon. For details on the conformance process, see [Qualifying Offerings and Self-Testing](https://github.com/knative/specs/blob/main/knative-conformance.md) and [Knative Conformance Certification](https://github.com/knative/specs/blob/main/docs/conformance_procedure.md). -The Knative Trademark Owner and the Knative Trademark Committee reserve the +The Knative Trademark Owner and the Knative Steering Committee reserve the right to approve or deny trademark permission for specific use cases in the best interest of the Knative Community. diff --git a/CALENDAR.MD b/CALENDAR.MD index f78257a4..7f87a556 100644 --- a/CALENDAR.MD +++ b/CALENDAR.MD @@ -9,7 +9,6 @@ Access to add new events to the calendar is available to folks that have a * Working Group leads * Steering Committee members -* Knative Trademark Committee members However, if there are other folks that have a need to have a @knative.team account, please file an issue with Steering Committee, or send an email to @@ -22,4 +21,4 @@ existing account (at least in some cases). If there's a one-off calendar invite needed, please send an email to `calendar-maintainers@knative.team` with the details of the event and we can -create the event for you. \ No newline at end of file +create the event for you. diff --git a/GOVERNANCE.md b/GOVERNANCE.md index 69b2b407..be62c06c 100644 --- a/GOVERNANCE.md +++ b/GOVERNANCE.md @@ -7,12 +7,9 @@ aliases: - /contributing/governance/ --- -Knative Governance is broken into three components. At a high level, the Knative -Steering Committee (KSC) is the "root" level governance body, but the Knative -Trademark Committee (KTC) operates within a protected governance umbrella in -parallel with the KSC. As such, the KSC may investigate and enforce Code of -Conduct actions against members of the KTC, but may not alter the charter or -governance of the KTC rules. The Tech Oversight Committee (TOC) operates +Knative Governance is broken into two components. At a high level, the Knative +Steering Committee (KSC) is the "root" level governance body. +The Tech Oversight Committee (TOC) operates entirely within the governance definitions delineated by the KSC. ## Community and Operations @@ -24,7 +21,7 @@ platforms, and test resources. ## Trademarks -The [Knative Trademark Committee](./TRADEMARK-COMMITTEE.md) is responsible for +The [Knative Steering Committee](./STEERING-COMMITTEE.md) is responsible for management, licensing, and conformance verification of Knative logos, names, and trademarks, including the definition of what "Knative" is and the definition and rules for usage of derived marks. diff --git a/README.md b/README.md index 109d8d4b..0118bcae 100644 --- a/README.md +++ b/README.md @@ -27,7 +27,6 @@ Other Documents committee - [Technical Oversight Committee](./TECH-OVERSIGHT-COMMITTEE.md) - describes our technical oversight committee -- [Trademark Committee](./TRADEMARK-COMMITTEE.md) - describes our trademark committee - [Community Roles](./ROLES.md) - describes the roles individuals can assume within the Knative community - [Reviewing and Merging Pull Requests](./REVIEWING.md) - how we manage pull diff --git a/REPOSITORY-GUIDELINES.md b/REPOSITORY-GUIDELINES.md index fc1d5526..c274b93f 100644 --- a/REPOSITORY-GUIDELINES.md +++ b/REPOSITORY-GUIDELINES.md @@ -180,7 +180,7 @@ of pluggability. The following are not required to create a working-group-owned repository: -- Steering or Trademark approval (see ["the fine print"](#the-fine-print)) +- Steering approval (see ["the fine print"](#the-fine-print)) - TOC approval - TOC may request certain naming patterns (e.g. `kn-plugin` for client WG) - Solving an unique problem (exploring different approaches to problems outside @@ -188,10 +188,10 @@ The following are not required to create a working-group-owned repository: ### The fine print -Steering and Trademark reserve the right to require that repos be removed or +Steering reserve the right to require that repos be removed or transferred out of the `knative-extensions` organization and API groups to be renamed. This is intended to simplify the process in the common case, while -giving Steering or Trademark the ability to step in and rectify problems that +giving Steering the ability to step in and rectify problems that may arise. ### Deletion diff --git a/STEERING-COMMITTEE.md b/STEERING-COMMITTEE.md index becb8a75..67460758 100644 --- a/STEERING-COMMITTEE.md +++ b/STEERING-COMMITTEE.md @@ -43,9 +43,8 @@ evolve as the community and project change. 1. Steward, control access, delegate access, and establish processes regarding all Knative project resources and has the final say in the disposition of those resources. -1. Advise the Trademark Committee on usage of the brand and marks in relation to - promoting the community. This advice is non-binding on the Trademark - Committee. +1. Coordinate with the CNCF regarding usage of the Knative brand and how that + brand can be used in relation to other efforts or vendors. 1. Define and evolve the scope of the Knative community and extensions, and the process for migration of extensions projects into Knative Extensions. 1. Receive and handle reports about [code of conduct](./CODE-OF-CONDUCT.md) diff --git a/TECH-OVERSIGHT-COMMITTEE.md b/TECH-OVERSIGHT-COMMITTEE.md index bbedf171..90f5760e 100644 --- a/TECH-OVERSIGHT-COMMITTEE.md +++ b/TECH-OVERSIGHT-COMMITTEE.md @@ -37,6 +37,9 @@ product and design decisions. - Approve the creation/deletion of GitHub repositories, along with other high-level administrative issues around GitHub and our other tools. + + - Advise the Steering Committe on conformance rules and tests that + define brand use decisions. - Happy Healthy Community diff --git a/TRADEMARK-COMMITTEE.md b/TRADEMARK-COMMITTEE.md deleted file mode 100644 index bfc28f75..00000000 --- a/TRADEMARK-COMMITTEE.md +++ /dev/null @@ -1,154 +0,0 @@ ---- -title: "Knative Trademark committee" -linkTitle: "Trademark committee" -weight: 50 -type: "docs" -aliases: - - /contributing/trademark-committee/ ---- - -The Knative Trademark Committee (KTC) -[advises the trademark owner on the usage and enforcement of Knative logos, names, and trademarks](./GOVERNANCE.md). - -It is a separate body from the [Steering Committee](./STEERING-COMMITTEE.md) to -better represent the needs of vendors and other companies which market products -in conjunction with the Knative mark. - -The governance of Knative is an open, living document, and will continue to -evolve as the community and project change. - -- [Charter](#charter) -- [Delegated Authority](#delegated-authority) -- [Committee Meetings](#committee-meetings) -- [Committee Members](#committee-members) -- [Decision Process](#decision-process) -- [Getting in touch](#getting-in-touch) -- [Composition](#composition) - - [Maintaining the Trademark Committee](#maintaining-the-trademark-committee) - -## Charter - -1. Advise the Trademark owner on the definition and enforcement of the "Knative" - trademark usage and branding guidelines. - -1. Review and approve conformance rules and tests that define brand use - decisions. - -1. Review and approve the scope and definition of additional derivative Knative - marks (e.g. Knative Serving, Knative Core, etc). - -1. Only the Trademark Committee can redefine its own charter, membership, and - authority over Knative Trademark, conformance, and brand decisions. - -## Delegated authority - -The Trademark Committee may choose to create and delegate its authority to other -committees as-needed. This may be used (for example) to create sub-committees -for specific technical or marketing questions related to conformance or joint -marketing. - -The Trademark Committee may delegate enforcement authority for one or more marks -to other Knative committees (such as the steering committee) to provide branding -for nascent efforts which are not yet subject to conformance and third-party -licensing. This delegation may be further delegated transitively, as needed. - -It is expected that the Trademark Committee will delegate one or more marks to -the steering committee to provide branding for nascent efforts which are not yet -subject to conformance and third-party licensing. - -## Committee Meetings - -The trademark committee currently meets weekly, or as-needed. Meetings are open to public and held online. - -Given the private nature of some of these discussions (e.g. trade secrets, legal -and compliance concerns, etc.) some meetings may be held in private. - -[Meeting notes](https://docs.google.com/document/d/1ghGQl0O7TM8N_YQ33w6xKyQ2yUnOX0ACsOnlqoV_XgY/edit#) are available to members of the -[knative-dev mailing list](https://groups.google.com/forum/#!forum/knative-dev) -(note: these are accessible to members of the knative-users list as well). -Public meetings will be recorded and the recordings made available publicly. - -Questions and proposals for changes to governance are posted as -[issues in the community repo](https://github.com/knative/community/issues), and -the trademark committee invites your feedback there. See -[Getting in touch](#getting-in-touch) for other options. - -## Committee Members - -| Member | Organization | Profile | -| ------------- | ------------ | -------------------------------------------------------------- | -| Mark Chmarny | Google | [@mchmarny](https://github.com/mchmarny) | -| Simon Moser | IBM/RedHat | [@smoser-ibm](https://github.com/smoser-ibm) | -| Sameer Vohra | VMware | [@xtreme-sameer-vohra](https://github.com/xtreme-sameer-vohra) | - -## Decision process - -The Trademark Committee desires to always reach consensus. Additionally, each -member can veto decisions regarding assignment of the mark, charter, -conformance, and scope. - -Decisions requiring a vote include: issuing written policy, amending existing -written policy, official responses to publicly raised issues, or any other -decisions that are in the scope of the Trademark Committee’s charter. - -Voted decisions pass when all members vote to approve the decision, or a -majority approves and the rest of the members abstain. - -Decisions are made in meetings when a quorum of the members are present and may -pass with at least half the members of the committee supporting it. Vetoes by -absent committee members must be presented within 5 business days of a published -decision. - -Quorum is considered reached when at least half of the members are present. -Quorum may be established over email or electronic chat systems as well as via -video or in-person meetings. - -In case of extended absence or removal from the project for a code of conduct -violation, the organization of the absent member may appoint a single -replacement delegate from the same company during the absence. - -## Getting in touch - -There are three ways to raise issues to the steering committee for decision: - -1. Emailing the steering committee at - [trademark@knative.team](mailto:trademark@knative.team). - This is a private discussion list to which all members of the committee have - access. -2. Open an issue in the knative community repository and indicate that you would like - attention from the trademark committee by using the 'trademark' label, or by - tagging the trademark committee GitHub user group. -3. Chat with the trademark committee in the #trademark-questions Slack channel - on the Knative Slack. - -## Composition - -The Trademark Committee is composed of company representatives from companies -which have substantially contributed to Knative over the last year, as well as -the trademark holder. Companies which have a currently-unfilled seat on the -Trademark Committee may veto decisions made in the 5 business days prior to the -selection of the representative. - -Company representatives serving on the Trademark Committee may individually -resign or be removed from their seats by their affiliated company with at least -5 days notice. - -For the 2020 year, one seat is assigned to each of Google, IBM/RedHat, and -VMware. - -### Maintaining the Trademark Committee - -The Trademark Committee membership is refreshed annually on the same timeline as -the Steering Committee elections (during the month of October). The Trademark -Committee's size is unbounded and may grow or shrink depending on the activity -in the project in the year prior to each refresh. - -Membership in the committee is determined by counting the -[easily countable contributions over the last year](https://knative.teststats.cncf.io/d/5/companies-table?orgId=1&var-period_name=Last%20year&var-metric=contributions). -Each company which has contributed at least 15% of the total project -contributions will be eligible to select one representative to the committee. -Not all contributions are easy to count and many significant contributions are -hard to count. Vendors may petition the Trademark Committee to articulate why -they should receive additional contribution credit towards membership on the -Trademark Committee. Corporate parents, affiliates, or subsidiaries shall be -counted as one company. diff --git a/groups/committee-trademark/OWNERS b/groups/committee-trademark/OWNERS deleted file mode 100644 index d7f07283..00000000 --- a/groups/committee-trademark/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -# The OWNERS file is used by prow to automatically merge approved PRs. - -approvers: -- trademark-committee -reviewers: -- trademark-committee diff --git a/groups/committee-trademark/groups.yaml b/groups/committee-trademark/groups.yaml deleted file mode 100644 index b0d6ec93..00000000 --- a/groups/committee-trademark/groups.yaml +++ /dev/null @@ -1,16 +0,0 @@ -groups: - - email-id: trademark@knative.team - name: trademark - description: |- - Trademark Committee Mailing List - settings: - WhoCanPostMessage: "ANYONE_CAN_POST" - ReconcileMembers: "true" - owners: - # VMware - - vsameer@vmware.com - # IBM / RedHat - - sdmoser@googlemail.com - - SMOSER@de.ibm.com - # Google - - spencerdillard@google.com diff --git a/groups/restrictions.yaml b/groups/restrictions.yaml index 28a98d48..810bcb2a 100644 --- a/groups/restrictions.yaml +++ b/groups/restrictions.yaml @@ -2,9 +2,6 @@ restrictions: - path: "committee-code-of-conduct/groups.yaml" allowedGroups: - "^code-of-conduct@knative.team$" - - path: "committee-trademark/groups.yaml" - allowedGroups: - - "^trademark@knative.team$" - path: "committee-oversight/groups.yaml" allowedGroups: - "^toc@knative.team$" diff --git a/mechanics/GDRIVE.md b/mechanics/GDRIVE.md index 5a07ce9a..0fca56cf 100644 --- a/mechanics/GDRIVE.md +++ b/mechanics/GDRIVE.md @@ -51,7 +51,6 @@ There are several mailing lists set up to manage permission groups (some could a * wg-leads – all working group leads, gives update permission on the Knative official events calendar * steering – steering committee members -* trademark – trademark committee members * (TODO) toc – tech oversight committee members diff --git a/mechanics/SC.md b/mechanics/SC.md index 36c78824..da6d5830 100644 --- a/mechanics/SC.md +++ b/mechanics/SC.md @@ -59,7 +59,7 @@ year but is not captured in the stats.knative.dev dashboard, they will be able to submit an exception form to the steering committee who will then review and determine whether this member should be marked as an exception. -Additionally, anyone serving on the SC, TOC, or Trademark Committee will +Additionally, anyone serving on the SC or TOC will automatically be eligible to vote regardless of their number of contributions. All eligible voters will be captured at diff --git a/mechanics/TOC.md b/mechanics/TOC.md index 966e83c9..e4f85bd9 100644 --- a/mechanics/TOC.md +++ b/mechanics/TOC.md @@ -53,7 +53,7 @@ year but is not captured in the stats.knative.dev dashboard, they will be able to submit an exception form to the steering committee who will then review and determine whether this member should be marked as an exception. -Additionally, anyone serving on the SC, TOC, or Trademark Committee will +Additionally, anyone serving on the SC or TOC will automatically be eligible to vote regardless of their number of contributions. All eligible voters will be captured at diff --git a/peribolos/knative-OWNERS_ALIASES b/peribolos/knative-OWNERS_ALIASES index 04d84f07..aba368f4 100644 --- a/peribolos/knative-OWNERS_ALIASES +++ b/peribolos/knative-OWNERS_ALIASES @@ -163,10 +163,6 @@ aliases: - dsimansk - krsna-m - psschwei - trademark-committee: - - mchmarny - - smoser-ibm - - xtreme-sameer-vohra ux-wg-leads: - cali0707 - leo6leo diff --git a/peribolos/knative.yaml b/peribolos/knative.yaml index 0e21e211..d4abe2ad 100644 --- a/peribolos/knative.yaml +++ b/peribolos/knative.yaml @@ -536,13 +536,6 @@ orgs: - puerco - salaboy privacy: closed - Trademark Committee: - description: Knative Trademark Committee - maintainers: - - xtreme-sameer-vohra - - smoser-ibm - - mchmarny - privacy: closed Technical Oversight Committee: description: Members of the Knative Technical Oversight Committee (TOC) maintainers: From b23266faa501b23b2d4f5ec32b73fd0dd8066423 Mon Sep 17 00:00:00 2001 From: Ali Ok Date: Sat, 3 Feb 2024 23:55:10 +0300 Subject: [PATCH 2/2] ./hack/update-codegen.sh --- peribolos/knative-OWNERS_ALIASES | 3 --- 1 file changed, 3 deletions(-) diff --git a/peribolos/knative-OWNERS_ALIASES b/peribolos/knative-OWNERS_ALIASES index aba368f4..ac2ad01f 100644 --- a/peribolos/knative-OWNERS_ALIASES +++ b/peribolos/knative-OWNERS_ALIASES @@ -78,16 +78,13 @@ aliases: - knative-prow-updater-robot - knative-test-reporter-robot - krsna-m - - mchmarny - nainaz - pierDipi - psschwei - puerco - salaboy - skonto - - smoser-ibm - upodroid - - xtreme-sameer-vohra knative-release-leads: - Cali0707 - Leo6Leo