Skip to content

Commit 5fac510

Browse files
authored
Merge pull request #5938 from justaugustus/wg-naming-bye
governance: Dissolution of WG Naming
2 parents 64a863b + 7828c21 commit 5fac510

File tree

12 files changed

+113
-150
lines changed

12 files changed

+113
-150
lines changed

OWNERS_ALIASES

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,10 +118,6 @@ aliases:
118118
wg-multitenancy-leads:
119119
- srampal
120120
- tashimi
121-
wg-naming-leads:
122-
- celestehorgan
123-
- jdumars
124-
- justaugustus
125121
wg-policy-leads:
126122
- JimBugwadia
127123
- rficcaglia
File renamed without changes.
File renamed without changes.
File renamed without changes.

liaisons.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ of SIGs, WGs and UGs.
5252
| [WG Data Protection](wg-data-protection/README.md) | Paris Pittman (**[@parispittman](https://github.com/parispittman)**) |
5353
| [WG IoT Edge](wg-iot-edge/README.md) | Derek Carr (**[@derekwaynecarr](https://github.com/derekwaynecarr)**) |
5454
| [WG Multitenancy](wg-multitenancy/README.md) | Jordan Liggitt (**[@liggitt](https://github.com/liggitt)**) |
55-
| [WG Naming](wg-naming/README.md) | Bob Killen (**[@mrbobbytables](https://github.com/mrbobbytables)**) |
5655
| [WG Policy](wg-policy/README.md) | Christoph Blecker (**[@cblecker](https://github.com/cblecker)**) |
5756
| [WG Structured Logging](wg-structured-logging/README.md) | Davanum Srinivas (**[@dims](https://github.com/dims)**) |
5857
| [UG Big Data](ug-big-data/README.md) | Derek Carr (**[@derekwaynecarr](https://github.com/derekwaynecarr)**) |

wg-naming/language-evaluation-framework.md renamed to sig-architecture/naming/language-evaluation-framework.md

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,23 @@ The framework was created for an open source technology project. The framework m
99

1010
## Using the framework
1111

12-
The framework is divided into three sections: first-, second-, and third-order concerns, ranked in order of potential harm to the community.
12+
The framework is divided into three sections: first-, second-, and third-order concerns, ranked in order of potential harm to the community.
1313

1414
First-order concerns are language where harm is egregious, overt, and clearly problematic. Second-order concerns are language which is problematic but with a less definite impact. Third-order concerns indicate language that could use improvement but does no demonstrable harm.
1515

1616
Answer all questions for each term evaluated.
1717

18+
When complete, consider questions answered in the affirmative: in general, the more questions answered “yes” or “possibly”, the more likely it is that the language in question needs to be replaced.
1819

19-
When complete, consider questions answered in the affirmative: in general, the more questions answered “yes” or “possibly”, the more likely it is that the language in question needs to be replaced.
20+
If any first-order concerns are a “yes”, replace the language.
2021

21-
If any first-order concerns are a “yes”, replace the language.
22-
23-
If a significant number of second- or third- order concerns are a “yes”, strongly consider replacing the language.
22+
If a significant number of second- or third- order concerns are a “yes”, strongly consider replacing the language.
2423

2524
This framework is intentionally non-prescriptive. The intention in this work is to reduce harm for the community; let harm reduction guide your decisions.
2625

2726
### First-order concerns
2827

29-
First-order concerns are characterized by:
28+
First-order concerns are characterized by:
3029

3130
- Overtness: regardless of its use in the context of code or technology, there is little to no ambiguity outside of technology as to whether the language in question indicates harm
3231
- Identity-specificity: language in question specifically unambiguously identifies a group of people
@@ -37,19 +36,19 @@ Examples include “master/slave”.
3736

3837
#### Is the term overtly sexist, transphobic, or pejorative about a gender identity?
3938

40-
Examples do _not_ include “transclusion” of dependencies, or “binary” operators.
39+
Examples do _not_ include “transclusion” of dependencies, or “binary” operators.
4140

4241
#### Is the term overtly ableist, or pejorative to neurodiverse or disabled people
4342

44-
Examples include performing “sanity checks”.
43+
Examples include performing “sanity checks”.
4544

46-
#### Is the term overtly homophobic?
45+
#### Is the term overtly homophobic?
4746

48-
Examples do not include “homogenizing” or “homogenous” data.
47+
Examples do not include “homogenizing” or “homogenous” data.
4948

5049
### Second-order concerns
5150

52-
Second-order concerns are characterized by:
51+
Second-order concerns are characterized by:
5352

5453
- Ambiguity: outside the context of code or technology, language might have connotations related to harmful scenarios like war, militarization, or policing, but the actual etymology of the term is not related to harm of a specific identity
5554
- Lack of specific identity: concerns in this category do not target specific identities, or do so in a non-overt way
@@ -62,7 +61,6 @@ Examples include “KILL” commands in Unix systems.
6261

6362
Examples include “marshal/unmarshal”.
6463

65-
6664
### Third-order concerns
6765

6866
Third-order concerns are characterized by:
@@ -73,46 +71,44 @@ Third-order concerns are characterized by:
7371

7472
- Idiomatic: Is language unclear to someone outside a specific culture?
7573

76-
7774
#### Is the term evocative instead of descriptive?
7875

79-
Examples include “PetSet” (evocative) versus “StatefulSet” (descriptive).
76+
Examples include “PetSet” (evocative) versus “StatefulSet” (descriptive).
8077

8178
#### Is the term ambiguous?
8279

83-
Examples include the use of ABORT/STOP/KILL in Unix-like systems, where they map to specific behaviors, versus general usage in programming languages, where they map to different behaviors or are used interchangeably.
80+
Examples include the use of ABORT/STOP/KILL in Unix-like systems, where they map to specific behaviors, versus general usage in programming languages, where they map to different behaviors or are used interchangeably.
8481

85-
## Footnotes
82+
## Footnotes
8683

8784
### Changes over time
8885

89-
In general, strong democratic societies become more progressive and accepting as time passes. This is a feature, not a bug.
86+
In general, strong democratic societies become more progressive and accepting as time passes. This is a feature, not a bug.
9087

91-
As a result, terms that were once deemed acceptable may, at some future point, be deemed unacceptable.
88+
As a result, terms that were once deemed acceptable may, at some future point, be deemed unacceptable.
9289

9390
We recommend:
9491

95-
- Placing a date at the top of any documents/recommendations related to naming, language inclusivity, or harm reduction
92+
- Placing a date at the top of any documents/recommendations related to naming, language inclusivity, or harm reduction
9693
- Expecting that some of your work will need re-evaluation at a later date
9794
- Openness to updating language as readers and cultures change
9895

99-
10096
### Dealing with trolls
10197

102-
In the handful of months since this work began, both Kubernetes as a whole and WG Naming have dealt with a number of issues and comments from trolls. We anticipate that anyone using this document to guide their own work will receive the same kind of attention.
98+
In the handful of months since this work began, both Kubernetes as a whole and WG Naming have dealt with a number of issues and comments from trolls. We anticipate that anyone using this document to guide their own work will receive the same kind of attention.
10399

104100
In Kubernetes we mostly encounter [sea lions](http://wondermark.com/1k62/) (concern trolls), who seek to legitimize debate over false concerns in order to use up contributors' energy and time.
105101

106-
We work with our GitHub and other moderation teams to shut down trolling behavior at the source and remove trolling content.
102+
We work with our GitHub and other moderation teams to shut down trolling behavior at the source and remove trolling content.
107103

108104
In cases where it’s unclear whether the poster is a legitimate user or a troll, we direct the work back to them: because they’re clearly “legitimately interested” in this topic, we ask them to join us in the WG Naming mailing list, drafting a formal suggestion (attached to an email address and identity we can track) and suggesting replacement terminology. Most trolls do not want to put in the effort.
109105

110-
Rather than be discouraged by trolls, consider it a heartening sign that you are engaged in meaningful work.
106+
Rather than be discouraged by trolls, consider it a heartening sign that you are engaged in meaningful work.
111107

112108
### Kudos
113109

114110
This work would not have come into shape without referencing the following resources freely available online. We thank the authors of these original documents for helping guide our thoughts on the topic:
115111

116-
- [APA Style Guide: General Principles for reducing bias](https://apastyle.apa.org/style-grammar-guidelines/bias-free-language/general-principles)
112+
- [APA Style Guide: General Principles for reducing bias](https://apastyle.apa.org/style-grammar-guidelines/bias-free-language/general-principles)
117113
- [Shopify Polaris Content Guidelines: Descriptive vs. Evocative names](https://polaris.shopify.com/content/naming#section-descriptive-vs-evocative-names)
118-
- [CNET: Twitter engineers: out with the old words...](https://www.cnet.com/news/twitter-engineers-replace-racially-loaded-tech-terms-like-master-slave/)
114+
- [CNET: Twitter engineers: out with the old words...](https://www.cnet.com/news/twitter-engineers-replace-racially-loaded-tech-terms-like-master-slave/)
Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
# Recommendation: replace Old Term
22

33
**Last Updated**: date PR was last updated, e.g. 2020-10-16
4+
45
**Status:** Accepted
56

6-
## Suggested Alternatives
7+
## Suggested Alternatives
8+
9+
Replacements:
710

8-
Replacements:
911
- `new term`: description of where this term is applicable.
1012
<any additional terms>
1113

1214
- Make the recommendation the title of the PR. For example: "Change default repository branches from 'master' to 'main'"
1315
- Provide a brief, 1-3 sentence summary of the reasoning for this change
14-
- Provide alternate recommendation(s) if needed
16+
- Provide alternate recommendation(s), if needed
1517

1618
## Context
1719

1820
- Provide information about the recommendation. Why does this proposal matter? Who does it affect? How will it help? How does it evaluate against the [language-evaluation-framework]?
1921

20-
## Precedents
22+
## Precedents
2123

22-
Provide any research, links to PR(s) from the Kubernetes project or other communities, standards body documents, or style guides that provide precedent for this decision.
24+
Provide any research, links to PR(s) from the Kubernetes project or other communities, standards body documents, or style guides that provide precedent for this decision.
2325

2426
## Impact
2527

26-
Link to the results of a [Hound](https://cs.k8s.io/) keyword search. What impact will this change create?
28+
Link to the results of a [Hound](https://cs.k8s.io/) keyword search. What impact will this change create?
29+
30+
[language-evaluation-framework]: /sig-architecture/naming/language-evaluation-framework.md

wg-naming/recommendations/001-master-control-plane.md renamed to sig-architecture/naming/recommendations/001-master-control-plane.md

Lines changed: 28 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Recommendation: master -> control plane
22

3-
**Last Updated**: 2020-10-16
3+
**Last Updated**: 2020-10-16
44

55
**Status**: Accepted
66

@@ -15,6 +15,7 @@ when talking about individual components or the roles they serve.
1515
## Suggested Alternatives
1616

1717
### Control Plane
18+
1819
- e.g. "The control plane is the set of all components responsible for
1920
controlling a kubernetes cluster"
2021
- e.g. "The control plane is the thing that can be communicated with in order to
@@ -26,19 +27,26 @@ when talking about individual components or the roles they serve.
2627
other"
2728
- instance, e.g. "we are going to create multiple control plane apiserver
2829
instances; we will talk only to this specific instance"
29-
- <component name>, e.g. "we will simulate an etcd fault by running this
30+
- <component-name>, e.g. "we will simulate an etcd fault by running this
3031
command on instances where etcd is hosted"
3132

3233
### Control Plane Node
33-
- "A node that hosts components that are part of the control plane", e.g.
34-
- https://github.com/kubernetes/enhancements/tree/master/keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint
34+
35+
- "A node that hosts components that are part of the control plane"
36+
37+
Examples:
38+
- https://git.k8s.io/enhancements/keps/sig-cluster-lifecycle/kubeadm/2067-rename-master-label-taint
3539
- https://github.com/kubernetes/kubernetes/pull/95053/files#diff-b4f6256abfd125f7ce69fd1ba1eaf595R886
36-
- Also relevant for terms other than node, e.g. control plane machine, control
37-
plane host, control plane vm, control plane instance, e.g.
40+
41+
- Also relevant for terms other than node e.g., "control plane machine",
42+
"control plane host", "control plane VM", "control plane instance"
43+
44+
Example:
3845
- https://github.com/kubernetes/kubernetes/blob/99cc89b7da32d9c06916deb50b27fdb46934b777/cluster/gce/gci/master-helper.sh#L33
3946
should be `create-control-plane-instance`
4047

4148
### Leader
49+
4250
- e.g. "The leader is the winner of a leader election"
4351
- When using an adjective instead of a noun to describe this concept, there is
4452
likely a more specific term:
@@ -47,6 +55,7 @@ other"
4755
- primary/replica
4856

4957
## Other Considerations
58+
5059
- if the api field, flag, code, command etc. uses the literal word 'master' and
5160
cannot be immediately changed or has no alternative available, use this word
5261
only in direct reference to the code item
@@ -71,11 +80,13 @@ control plane?
7180

7281
Master raises first-order concerns according to [our language evaluation
7382
framework][framework]:
83+
7484
- it is overtly racist (ref: [django][django-master], [Drupal][drupal-master],
7585
[IETF][ietf-master],
7686
[Google][https://developers.google.com/style/word-list#master])
7787

7888
Master also raises third-order concerns:
89+
7990
- within kubernetes it is used to represent a variety of overlapping or
8091
unrelated concepts (see the variety of suggested alternatives)
8192
- one class of usage represents a set of false assumptions:
@@ -85,29 +96,28 @@ Master also raises third-order concerns:
8596
on certain ports, etc.)
8697

8798
Prior discussions:
99+
88100
- [kubernetes-wg-naming@ - proposal: master/slave
89101
alternatives][wg-naming-thread]
90102
- [kubernetes-sig-architecture@ - Re: the way we discuss control plane
91103
members][sig-arch-thread]
92104

93105
## Consequences
94106

95-
TODO
107+
## TODO
96108

97-
- hound search that approximates excluding some master-branch-in-docs
98-
references, and references in vendor/:
99-
https://cs.k8s.io/?q=master%5B%5E%2F%5D&i=nope&files=%5E%5B%5Ev%5D&repos=
100-
- references to master in test/e2e/framework
101-
(https://github.com/kubernetes/kubernetes/issues/94901)
102-
- references to master in test/integration
103-
(https://github.com/kubernetes/kubernetes/issues/94900)
109+
- [hound search](https://cs.k8s.io/?q=master%5B%5E%2F%5D&i=nope&files=%5E%5B%5Ev%5D&repos=)
110+
that approximates excluding some master-branch-in-docs references, and
111+
references in `vendor/`
112+
- [references to "master" in `test/e2e/framework`](https://github.com/kubernetes/kubernetes/issues/94901)
113+
- [references to "master" in `test/integration`](https://github.com/kubernetes/kubernetes/issues/94900)
104114
- known names/flags/fields/labels/annotations that may take time to change
105-
- `"system:masters"` aka
115+
- `"system:masters"` AKA
106116
[k8s.io/apiserver/pkg/authentication/user.SystemPrivilegedGroup][system-privileged-group]
107-
- `node-role.kubernetes.io/master` (tracking issue for KEP
108-
https://github.com/kubernetes/enhancements/issues/2067)
117+
- `node-role.kubernetes.io/master`
118+
([enhancement tracking issue](https://github.com/kubernetes/enhancements/issues/2067))
109119
- `--endpoint-reconciler-type master-count`
110-
- probably more
120+
- ...probably more
111121

112122
[architecture]: https://git.k8s.io/community/contributors/design-proposals/architecture/architecture.md#architecture
113123
[wg-naming-thread]: https://groups.google.com/g/kubernetes-wg-naming/c/VqrBCdUHdPc

0 commit comments

Comments
 (0)