Merge pull request #7407 from cantbewong/retirevmwareug

k8s-ci-robot · web-flow · commit 39cae63d5f38 · 2023-07-27T17:29:52.000-07:00
Retire VMware User Group and remove User Groups as a K8s Group category since this removes the last, only one
diff --git a/OWNERS_ALIASES b/OWNERS_ALIASES
@@ -144,11 +144,6 @@ aliases:
   wg-structured-logging-leads:
     - pohly
     - serathius
-  ug-vmware-users-leads:
-    - brysonshepherd
-    - cantbewong
-    - mylesagray
-    - phenixblue
   committee-code-of-conduct:
     - detiber
     - endocrimes
diff --git a/README.md b/README.md
@@ -30,9 +30,6 @@ Kubernetes has the following types of groups that are officially supported:
 * **Working Groups** are temporary groups that are formed to address issues that cross SIG boundaries.
   Working groups do not own any code or other long term artifacts.
   Working groups can report back and act through involved SIGs.
-* **User Groups** are groups for facilitating communication and discovery of information related to
-  topics that have long term relevance to large groups of Kubernetes users.
-  They do not have ownership of parts of the Kubernetes code base.
 
 See the [full governance doc](governance.md) for more details on these groups.
 
diff --git a/archive/ug-vmware-users/README.md b/archive/ug-vmware-users/README.md
diff --git a/committee-steering/governance/annual-reports.md b/committee-steering/governance/annual-reports.md
@@ -1,15 +1,14 @@
 # Kubernetes Community Group Annual Reports
 
 This document outlines the process for an annual reporting and
-communication structure for Special Interest Groups (SIGs), Working Groups (WGs),
-User Groups (UGs), and Committees.
-All policy updates will be in their respective [SIG], [WG], and [UG]
+communication structure for Special Interest Groups (SIGs), Working Groups (WGs), and Committees.
+All policy updates will be in their respective [SIG] or [WG]
  governance docs as well as the general [governance] guidance.
 
 ## Goals
 - Paint a complete project health picture for all of our community groups
-- Create a feedback loop between Chairs, Tech Leads, Subproject Owners, WG and
-UG Organizers, the community groups at large, and the Steering
+- Create a feedback loop between Chairs, Tech Leads, Subproject Owners, WG
+ Organizers, the community groups at large, and the Steering
 Committee to move the project forward  
 - Encourage dialogue about the wellbeing of the projects contributors and offer
 suggested guidance and coaching
@@ -289,6 +288,5 @@ https://www.apache.org/foundation/board/reporting
 
 [SIG]: https://git.k8s.io/community/committee-steering/governance/sig-governance.md
 [WG]: https://git.k8s.io/community/committee-steering/governance/wg-governance.md
-[UG]: https://git.k8s.io/community/committee-steering/governance/ug-governance.md
 [governance]: https://git.k8s.io/community/governance.md
 [questions]: #questions-for-report
diff --git a/committee-steering/governance/ug-governance.md b/committee-steering/governance/ug-governance.md
diff --git a/communication/calendar-guidelines.md b/communication/calendar-guidelines.md
@@ -115,8 +115,6 @@ In case you are creating a calendar event and wondering what to include in it, h
 [SIG-<name>] <meeting title>
 or
 [WG-<name>] <meeting title>
-or
-[User Group-<name>]
 ```
 #### Description
 
diff --git a/communication/slack-guidelines.md b/communication/slack-guidelines.md
@@ -150,7 +150,7 @@ To add a channel, open a Pull Request (PR) updating the [slack-config].
         -   `#projectname`
 -   In the PR comments, include some details regarding the purpose of the
     Channel.
-    -   Channels should be dedicated to [SIGs, WGs, UGs][sig-list], sub-projects,
+    -   Channels should be dedicated to [SIGs or WGs][sig-list], sub-projects,
         community topics, or related Kubernetes programs/projects.
     -   Linking to resources such as the PR adding the subproject will speed in
         the validation and processing of the channel creation request.
@@ -299,15 +299,15 @@ bots, tokens or webhooks. Please see the processes outlined below.
 #### Processing Channel Requests
 
 Channel requests should be reviewed for their relation and relevance to the
-Kubernetes community. Typically channels should be dedicated to SIGs, WGs, UGs,
+Kubernetes community. Typically channels should be dedicated to SIGs, WGs, 
 sub-projects, community topics, and other things related to Kubernetes programs
 and projects.
 
 For Kubernetes project centric requests, validate them against the
 [sig-list], or request a link to a related issue/PR, or mailing
 list discussion for the requested Channel.
 
-Small external projects are encouraged to use the channel of the SIG, WG, or UG
+Small external projects are encouraged to use the channel of the SIG or WG 
 most relevant to them. Other things such as programming language-specific
 channels are discouraged and should in turn be steered to `#kubernetes-client`
 or communication avenues commonly used by their specific language.
diff --git a/communication/youtube/youtube-guidelines.md b/communication/youtube/youtube-guidelines.md
@@ -21,11 +21,11 @@ and includes all communications such as YouTube.
 
 ## Meeting Playlists
 
-The [Kubernetes YouTube Channel] has separate playlists for each SIG, WG, UG
+The [Kubernetes YouTube Channel] has separate playlists for each SIG or WG 
 meeting recordings, as well as recordings of other recurring events such as the
 Kubernetes [community meeting], and others.
 
-[Subprojects], in addition to SIGs, WGs, UGs may request their own playlists
+[Subprojects], in addition to SIGs and WGs may request their own playlists
 to better target their contributors and increase general discoverability.
 
 To better serve the community, [collaboration] has been enabled to share the
diff --git a/contributors/guide/style-guide.md b/contributors/guide/style-guide.md
@@ -104,7 +104,7 @@ These are **guidelines**, not rules. Use your best judgement.
 - If using acronyms, ensure they are clearly defined in the same document.
 - If using an abbreviation, spell it out the first time it is used in the
   document unless it is commonly known. (example: TCP/IP)
-- When referring to a Kubernetes Group (SIG, WG, or UG) do not use the hyphenated
+- When referring to a Kubernetes Group (SIG or WG) do not use the hyphenated
   form unless it is for a specific purpose such as a file-name or URI.
 
 **[Moving a Document:](#moving-a-document)**
@@ -393,7 +393,7 @@ external appearance.
   - **Good example:** A _CustomResourceDefinition_ (CRD) extends the Kubernetes
     API.
   - **Bad example:** A CRD extends the Kubernetes API.
-- When referring to a Kubernetes Group (SIG, WG, or UG) do not use the hyphenated
+- When referring to a Kubernetes Group (SIG or WG) do not use the hyphenated
   form unless it is for a specific purpose such as a file-name or URI.
   - **Good example:** SIG Docs oversees the Kubernetes website.
   - **Bad example:** SIG-Docs oversees the Kubernetes website.
diff --git a/elections/steering/documentation/template/README.md b/elections/steering/documentation/template/README.md
@@ -107,7 +107,7 @@ Committee's governance will be considered for voter exception.
 Examples of contributions that would be considered:
 * Slack admins who are not active in GitHub
 * K8s Infra staff doing mostly support
-* Working Group or User Group leads without a lot of GitHub activity
+* Working Group leads without a lot of GitHub activity
 
 Examples of contributions that would NOT be considered:
 * Contributions to ecosystem projects and products
diff --git a/elections/teams/README.md b/elections/teams/README.md
@@ -5,8 +5,8 @@ we can host any number of elections for community groups, as they need them.
 
 ## Who Can Request an Election
 
-Any "Kubernetes team" can request an election.  This includes SIGs, Working Groups,
-User Groups, operational teams like Release Engineering or Enhancements, 
+Any "Kubernetes team" can request an election.  This includes SIGs, Working 
+Groups, operational teams like Release Engineering or Enhancements, 
 Subprojects, and even wholly subsidiary projects like Prow and ClusterAPI.
 Basically, if your group is all Kubernetes contributors, you can ask for an
 election.
diff --git a/generator/README.md b/generator/README.md
@@ -1,8 +1,8 @@
 # SIG Doc builder
 
 This folder contains scripts to automatically generate documentation about the
-different Special Interest Groups (SIGs), Working Groups (WGs),
-User Groups (UGs) and Committees of Kubernetes. The authoritative
+different Special Interest Groups (SIGs), Working Groups (WGs) 
+and Committees of Kubernetes. The authoritative
 source for SIG information is the [`sigs.yaml`](/sigs.yaml) file in the project root.
 All updates must be done there.
 
@@ -14,7 +14,6 @@ The documentation follows a template and uses the values from [`sigs.yaml`](/sig
 - List: [`list.tmpl`](list.tmpl)
 - SIG README: [`sig_readme.tmpl`](sig_readme.tmpl)
 - WG README: [`wg_readme.tmpl`](wg_readme.tmpl)
-- UG README: [`ug_readme.tmpl`](ug_readme.tmpl)
 - Committee README: [`committee_readme.tmpl`](committee_readme.tmpl)
 
 **Time Zone gotcha**:
@@ -31,7 +30,6 @@ accompanying documentation. This takes the format of the following types of doc
 ```
 sig-<sig-name>/README.md
 wg-<working-group-name>/README.md
-ug-<user-group-name>/README.md
 committee-<committee-name>/README.md
 sig-list.md
 ```
@@ -91,7 +89,7 @@ for i in $(ls -1 generator/generated/*.md); do hub issue create -F $i && rm $i;
 
 ### README
 
-If your SIG, WG, UG or Committee wishes to add custom content, you can do so by placing it within
+If your SIG, WG or Committee wishes to add custom content, you can do so by placing it within
 the following code comments:
 
 ```markdown
diff --git a/generator/liaisons.tmpl b/generator/liaisons.tmpl
@@ -18,7 +18,7 @@ the Steering Committee.
 
 Liaisons are assigned community groups at random (adjustments can be
 made, if needed) with each member having an (almost) equal distribution
-of SIGs, WGs and UGs. Each year after Steering Committee elections, new 
+of SIGs and WGs. Each year after Steering Committee elections, new 
 members will assume one of the departing members groups. 
 
 | Community Group            | Steering Committee Liaison |
diff --git a/generator/list.tmpl b/generator/list.tmpl
@@ -2,7 +2,7 @@
 title: Community Groups
 linkTitle: Community Groups
 description:  |
-  A list of our community groups: Special Interest Groups, Working Groups, User Groups and Committees.
+  A list of our community groups: Special Interest Groups, Working Groups and Committees.
 weight: 99
 type: docs
 aliases: [ "/groups", "/sigs" ]
@@ -45,14 +45,6 @@ When the need arises, a [new SIG can be created](sig-wg-lifecycle.md)
 |[{{.Name}}]({{.Dir}}/README.md)|[{{.Label}}](https://github.com/kubernetes/kubernetes/labels/wg%2F{{.Label}})|{{range .StakeholderSIGs}}* {{.}}<br>{{end }}|{{range .Leadership.Chairs}}* [{{.Name}}](https://github.com/{{.GitHub}}){{if .Company}}, {{.Company}}{{end}}<br>{{end}}|* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}})<br>* [Mailing List]({{.Contact.MailingList}})|{{range .Meetings}}* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>{{end}}
 {{- end }}
 
-### User Groups
-
-| Name | Label |Organizers | Contact | Meetings |
-|------|-------|------------|--------|----------|
-{{- range .UserGroups}}
-|[{{.Name}}]({{.Dir}}/README.md)|[{{.Label}}](https://github.com/kubernetes/kubernetes/labels/ug%2F{{.Label}})|{{range .Leadership.Chairs}}* [{{.Name}}](https://github.com/{{.GitHub}}){{if .Company}}, {{.Company}}{{end}}<br>{{end}}|* [Slack](https://kubernetes.slack.com/messages/{{.Contact.Slack}})<br>* [Mailing List]({{.Contact.MailingList}})|{{range .Meetings}}* {{.Description}}: [{{.Day}}s at {{.Time}} {{.TZ}} ({{.Frequency}})]({{.URL}})<br>{{end}}
-{{- end }}
-
 ### Committees
 
 | Name |  Label | Members | Contact |
diff --git a/generator/ug_readme.tmpl b/generator/ug_readme.tmpl
diff --git a/governance.md b/governance.md
@@ -34,7 +34,6 @@ The project is comprised of the following types of subgroups:
   * Subprojects
 * Working Groups, WGs
 * Committees
-* User Groups
 
 ![Kubernetes Governance Diagram](kubernetes_governance_diagram.png)
 
@@ -133,35 +132,6 @@ however, all committee members must be [community members].  Like a SIG, a
 committee has a charter and a chair, and will report to the steering committee
 periodically, and to the community as makes sense, given the charter.
 
-## User groups
-Some topics have long term relevance to large groups of Kubernetes users, but
-do not have clear deliverables or ownership of parts of the Kubernetes
-code base. As such they are neither good fits for SIGs or Working Groups.
-An example of such a topic might be continuous delivery to Kubernetes.
-
-Though their central goal is not a deliverable piece of work, as contributing
-members of the community user groups are expected to work with SIGs
-to either identify friction or usability issues that need to be addressed,
-or to provide or improve documentation in their area of expertise. However
-these activities are covered under general code contributions to the relevant
-SIGs (e.g. SIG Docs) rather than as part of the user group. These contributions
-are expected to be more incremental and ad-hoc versus the more targeted
-output of a user group.
-
-User groups function as a centralized resource to facilitate communication and
-discovery of information related to the topic of the user group. User groups
-should not undertake to produce any deliverable, instead they should form
-working groups under the auspices of some SIG for such work. Likewise they
-shouldn't take ownership of anything in the Kubernetes process, as that is a
-role for SIGs. All user group chairs, and others that hold leadership positions
-within a user group must be [community members].
-
-See [user group governance] for more details about forming and disbanding
-User Groups.
-
-To facilitate discoverability and engagement,
-user groups are documented in [sigs.yaml].
-
 ## Community Group Annual Reports
 As you can see in the descriptions above, the project is robust with diverse
 groups of contributors and their varying degrees of expected communications.
@@ -220,7 +190,6 @@ All contributors must sign the CNCF CLA, as described [here](CLA.md).
 [sig charter process]: /committee-steering/governance/README.md
 [kubernetes repository guidelines]: /github-management/kubernetes-repositories.md
 [working group governance]: /committee-steering/governance/wg-governance.md
-[user group governance]: /committee-steering/governance/ug-governance.md
 [SIG Governance Requirements]: /committee-steering/governance/sig-governance-requirements.md
 [annual community group health check]: /committee-steering/governance/annual-reports.md
 [KEP process]: https://github.com/kubernetes/enhancements/tree/master/keps#kubernetes-enhancement-proposals-keps
diff --git a/liaisons.md b/liaisons.md
@@ -25,7 +25,7 @@ the Steering Committee.
 
 Liaisons are assigned community groups at random (adjustments can be
 made, if needed) with each member having an (almost) equal distribution
-of SIGs, WGs and UGs. Each year after Steering Committee elections, new 
+of SIGs and WGs. Each year after Steering Committee elections, new 
 members will assume one of the departing members groups. 
 
 | Community Group            | Steering Committee Liaison |
@@ -60,7 +60,6 @@ members will assume one of the departing members groups.
 | [WG LTS](wg-lts/README.md) | TBD (**[@TBD](https://github.com/TBD)**) |
 | [WG Policy](wg-policy/README.md) | Christoph Blecker (**[@cblecker](https://github.com/cblecker)**) |
 | [WG Structured Logging](wg-structured-logging/README.md) | Nabarun Pal (**[@palnabarun](https://github.com/palnabarun)**) |
-| [UG VMware Users](ug-vmware-users/README.md) | Tim Pepper (**[@tpepper](https://github.com/tpepper)**) |
 | [Committee Code of Conduct](committee-code-of-conduct/README.md) | Tim Pepper (**[@tpepper](https://github.com/tpepper)**) |
 | [Committee Security Response](committee-security-response/README.md) | Stephen Augustus (**[@justaugustus](https://github.com/justaugustus)**) |
 <!-- BEGIN CUSTOM CONTENT -->
diff --git a/mentoring/programs/contributor-workshop/live-workshop/community-groups.md b/mentoring/programs/contributor-workshop/live-workshop/community-groups.md
@@ -17,7 +17,6 @@ Refer to previous workshops for inspirations.
 - SIGs
 - Subprojects
 - Working Groups
-- User Groups
 - Committees
 - How to Join Any Of The Above
 
diff --git a/sig-list.md b/sig-list.md
diff --git a/sig-wg-lifecycle.md b/sig-wg-lifecycle.md
diff --git a/sigs.yaml b/sigs.yaml
