Skip to content

Commit

Permalink
retire VMware UG and remove User Groups as an official K8s group type
Browse files Browse the repository at this point in the history
  • Loading branch information
cantbewong committed Jul 20, 2023
1 parent 86a7bef commit b236e43
Show file tree
Hide file tree
Showing 20 changed files with 26 additions and 238 deletions.
5 changes: 0 additions & 5 deletions OWNERS_ALIASES
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
10 changes: 4 additions & 6 deletions committee-steering/governance/annual-reports.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
44 changes: 0 additions & 44 deletions committee-steering/governance/ug-governance.md

This file was deleted.

2 changes: 0 additions & 2 deletions communication/calendar-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions communication/slack-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions communication/youtube/youtube-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 WGsmay 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
Expand Down
4 changes: 2 additions & 2 deletions contributors/guide/style-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)**
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion elections/steering/documentation/template/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions elections/teams/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 3 additions & 5 deletions generator/README.md
Original file line number Diff line number Diff line change
@@ -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.

Expand All @@ -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**:
Expand All @@ -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
```
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion generator/liaisons.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
10 changes: 1 addition & 9 deletions generator/list.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
Expand Down Expand Up @@ -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 |
Expand Down
57 changes: 0 additions & 57 deletions generator/ug_readme.tmpl

This file was deleted.

31 changes: 0 additions & 31 deletions governance.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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
3 changes: 1 addition & 2 deletions liaisons.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -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 -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ Refer to previous workshops for inspirations.
- SIGs
- Subprojects
- Working Groups
- User Groups
- Committees
- How to Join Any Of The Above

Expand Down
Loading

0 comments on commit b236e43

Please sign in to comment.