Skip to content

Commit ba3444c

Browse files
authored
Merge branch 'kubernetes:master' into patch-3
2 parents 08cc2f7 + 53bb3f2 commit ba3444c

File tree

24 files changed

+164
-72
lines changed

24 files changed

+164
-72
lines changed

OWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
approvers:
4-
- alisondy
54
- cblecker
65
- idvoretskyi
76
- jdumars
@@ -11,6 +10,7 @@ approvers:
1110
- sig-contributor-experience-leads
1211
- committee-steering
1312
emeritus_approvers:
13+
- alisondy
1414
- castrojo
1515
- calebamiles
1616
- grodrigues3

OWNERS_ALIASES

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ aliases:
3535
- neolit123
3636
- vincepri
3737
sig-contributor-experience-leads:
38-
- alisondy
3938
- cblecker
4039
- jberkus
4140
- mrbobbytables
@@ -163,11 +162,11 @@ aliases:
163162
- tabbysable
164163
- tallclair
165164
committee-steering:
165+
- BenTheElder
166166
- cblecker
167-
- dims
168167
- justaugustus
169-
- liggitt
170168
- mrbobbytables
169+
- palnabarun
171170
- parispittman
172171
- tpepper
173172
## BEGIN CUSTOM CONTENT

committee-code-of-conduct/governance/onboarding-offboarding.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Different actions on this list must be carried out by different members:
1313
**Who executes:** When offboarding, outgoing members must remove themselves from Slack channels. When onboarding, carryover members must add incoming members.
1414

1515
- [ ] Code of conduct committee Slack channel(s) (public and private) on `kubernetes.slack.com`
16+
- [ ] `#kubernetes-moderators` and `#slack-reports` private channels on `kubernetes.slack.com`
1617
- [ ] Code of conduct sync Slack channel on `cloud-native.slack.com`
1718

1819
### Slack Channel Admin Privileges

committee-steering/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ The [charter](https://git.k8s.io/steering/charter.md) defines the scope and gove
2121

2222
## Members
2323

24+
* Benjamin Elder (**[@BenTheElder](https://github.com/BenTheElder)**), Google
2425
* Christoph Blecker (**[@cblecker](https://github.com/cblecker)**), Red Hat
25-
* Davanum Srinivas (**[@dims](https://github.com/dims)**), VMware
2626
* Stephen Augustus (**[@justaugustus](https://github.com/justaugustus)**), Cisco
27-
* Jordan Liggitt (**[@liggitt](https://github.com/liggitt)**), Google
2827
* Bob Killen (**[@mrbobbytables](https://github.com/mrbobbytables)**), Google
28+
* Nabarun Pal (**[@palnabarun](https://github.com/palnabarun)**), VMware
2929
* Paris Pittman (**[@parispittman](https://github.com/parispittman)**), Apple
3030
* Tim Pepper (**[@tpepper](https://github.com/tpepper)**), VMware
3131

communication/README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Communication
22

33
The Kubernetes community abides by the [Kubernetes code of conduct] on all of
4-
communication platforms that we moderate listed below with noted exceptions.
4+
the communication platforms that we moderate listed below with noted exceptions.
55
Here is an excerpt from the code of conduct:
66

77
> _As contributors and maintainers of this project, and in the interest
@@ -27,11 +27,11 @@ agenda/notes, and can be found on their READMEs and on the community
2727
groups/[SIGs] page.
2828

2929
You can actively or passively participate in one of the following ways:
30-
- The community groups public meeting(s) listed in the above community groups page
30+
- The community group's public meeting(s) listed on the above community groups page
3131
- Every Third Thursday at our [monthly community meeting] over [zoom] at [10am US Pacific Time]
3232
- Intro sessions at KubeCon/CloudNativeCon live or [recordings on YouTube]
3333

34-
Nevertheless, below find a list of many general channels, groups and meetings
34+
Nevertheless, below find a list of many general channels, groups, and meetings
3535
devoted to the Kubernetes project. Please check the guidelines and any relevant
3636
chat/conversation history before posting. Spam and sales pitches are not tolerated
3737
on these platforms.
@@ -98,7 +98,7 @@ and security issues
9898
- [Discuss Kubernetes] is a forum where Kubernetes users trade notes with sections
9999
for contributors and all kinds of ecosystem related content
100100
- Additional Google groups exist and can be joined for discussion related to each
101-
community groups as noted above. These are linked from the [SIG list][SIGs].
101+
community group as noted above. These are linked from the [SIG list][SIGs].
102102

103103
### Calendar & Meetings
104104

@@ -154,14 +154,14 @@ resources.
154154
- [kubeweekly] - owned by cncf and curated by community members listed on the site.
155155
Collection of news, blogs, talks, and events for all things Kubernetes.
156156
send submissions to [email protected]
157-
- [LWKD] - weekly newsletter that summarizes changes to Kubernetes code, development,
157+
- [LWKD] - a weekly newsletter that summarizes changes to Kubernetes code, development,
158158
and release schedules. Written by two members of SIG-Contribex.
159159

160160
### Conferences, Meetups, Summits, and Face to Face Meetings
161161

162162
CNCF is the main driver for all KubeCon + CloudNativeCons, Kubernetes Forums,
163163
and the [Kubernetes Meetup Pro] program on meetup.com. KubeCon + CloudNativeCon,
164-
held every spring in Europe, summer in China, and winter in North America.
164+
is held every spring in Europe, summer in China, and winter in North America.
165165
Information about these and other community events is available on the CNCF [events]
166166
pages.
167167

communication/marketing-team/storytelling-resources/blog-guidelines.md

Lines changed: 37 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,47 @@ We are looking for Kubernetes-curious community members who are **interested in
66

77
## Requested Content
88

9-
We are looking for:
9+
We are looking for content related to the contributor experience and with increasing the visibility of Kubernetes and how it is developed: this includes interviews with SIGs, articles on how to better use existing tools and processes, and in general tips and suggestions on how to collaborate.
1010

11-
* TODO << Request specific types of content
11+
Other types of content, like Kubernetes capabilities, tutorials, and technical articles, are better suited for the [SIG-Docs blogging initiative](/sig-docs/blog-subproject/README.md).
1212

13-
Other types of content, like Kubernetes capabilities and tutorials, are better suited for the [SIG-Docs blogging initiative](/sig-docs/blog-subproject/README.md).
13+
## Where to publish
1414

15-
## Submit a Post
15+
As mentioned, the focus of the Contributor Experience articles is targeted at those that contribute to Kubernetes, but sometimes it's not obvious were a specific theme will fit. The following are the most common situations:
1616

17-
The quickest way to get involved is to let the team in [#sig-contribex](https://kubernetes.slack.com/archives/C1TU9EB9S) know that you have an idea for an article.
17+
1. Article is just for [k8s.dev](http://k8s.dev/blog): this is when it is relevant for the contributor community, and not necessarily for Kubernetes end-users. An example is an article explaining how to use some specific tool or automation that helps with the Kubernetes development process.
18+
2. Article is just for [kubernetes.io](https://kubernetes.io/blog/): when the article targets Kubernetes end-users, and not specifically the contributor community. Examples include most technical articles on Kubernetes features, updates on new features and deprecations, etc.
19+
3. Article is relevant for both: sometimes, an article will be relevant to both the Kubernetes end-users, and the contributor community. Examples include interviews with SIGs and WGs, articles on technical aspects that are important for the contributor community, etc.
20+
21+
The decision on what is the right option will be made jointly by the SIG Contribex Comms and the SIG Docs Blogging editorial team: as a content writer you shouldn't be overly concerned about it, expect in how it can change the approval process, as described below.
22+
23+
## Submission and review process
24+
25+
The quickest way to get involved is to let the team in [#sig-contribex-comms](https://kubernetes.slack.com/archives/C03KT3SUJ20) know that you have an idea for an article; the team will identify the best target for your submission and liaison with the necessary teams, if needed. To reduce the amount of editing done directly in GitHub, a two-stage approach is highly recommended.
26+
27+
This process is initiated in [#sig-contribex-comms](https://kubernetes.slack.com/archives/C03KT3SUJ20) and uses the processes from the SIG Docs blog [subproject](/sig-docs/blog-subproject/README.md), and is broadly as follows:
28+
29+
1. Present your idea to the community, by going to the [#sig-contribex-comms](https://kubernetes.slack.com/archives/C03KT3SUJ20) Slack channel, or by joining the [weekly meeting](https://docs.google.com/document/d/1KDoqbw2A6W7rLSbIRuOlqH8gkoOnp2IHHuV9KyJDD2c). This will make it easier to coordinate effort and avoid duplicate effort, as well as to gather initial suggestions around the article scope.
30+
2. The submission idea will be reviewed by the team, including the decision on where to publish it; someone from the SIG Contribex Comms team will reach out to the [#sig-docs-blog](https://kubernetes.slack.com/archives/CJDHVD54J) editorial team to clarify if the content is adequate for republishing in the main Kubernentes blog. At this stage an editor should be assigned to follow-up the process with you.
31+
3. Create your proposal draft in [Google Docs](https://docs.google.com/) or HackMD (https://hackmd.io), and ask for a review in [the channel](https://kubernetes.slack.com/archives/C03KT3SUJ20). This will facilitate easier editing, especially if major changes or restructuring is needed. Take into account the [documentation style guide](https://kubernetes.io/docs/contribute/style/style-guide/): these guidelines can help in improving the readability of your article, especially in terms of the use of Kubernetes terminology.
32+
4. Once you have reflected any feedback in the proposal draft, announce that the article is ready for submission (again, in the channel or in one of the weekly meetings): the assigned editor will use the final text to open the PR, adding you as a Co-author
33+
5. (Optional) If the submission will be mirrored in the main Kubernetes site, a second PR will be oped by the editor, but on the main repository, and after being approved in the `contributor-site` one.
34+
35+
For now, our official process is to use [SIG Docs' system](/sig-docs/blog-subproject/README.md), with one change: instead of directly creating the file in the Kubernetes site repository, as instructed abovem it's initially created in the [contributor-site](https://github.com/kubernetes/contributor-site), in the appropriate folder (i.e. the right year in `contributor-site/content/en/blog/`).
36+
37+
This will lead to an initial review process before it gets mirrored to the main Kubernetes site.
38+
39+
### Editor instructions
40+
41+
Once the text is final, an editor will open the PR. This facilitates the approval process and prevents articles with massive restructuring or changes needed to be submitted to GitHub, something that makes the review process substantially more difficult.
42+
43+
In order to keep the authorship information (which will make the submission count towards the contribution of the article author), editors must [add the original author as a co-author](https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors). This is done by adding `Co-authored-by: original-author-name <[email protected]>` to the commit message.
44+
45+
The number of PRs depends on where the article will be published:
46+
47+
1. If it's solely for the Contributor site: the PR should be opened in the [contributor-site](https://github.com/kubernetes/contributor-site), after which the process ends.
48+
2. If it's to be mirrored in the main Kubernetes blog: after the previous step, a new PR is opened on [kubernetes/website](https://github.com/kubernetes/website), mentioning the original PR. The SIG-Docs Blog editorial team will, in this case, already been notified and involved in the initial PR.
1849

19-
For now, our official process is to use [SIG-Doc's system](/sig-docs/blog-subproject/README.md).
2050

2151
## Blogger Expectations, Responsibilities, and Info
2252

@@ -52,14 +82,11 @@ Keep the following points in mind as you write in order to speed up the review p
5282
* Avoid interjecting personal reactions
5383
* Ensure that the blog post is reviewed by the anyone being mentioned in the piece
5484
* As the author, never talk about your employer, sell, promote, or pitch; this is about upstream community endeavours and the individuals and groups that create it
85+
* Follow the [documentation style guide](https://kubernetes.io/docs/contribute/style/style-guide/).
5586

5687
## Further Recommendations
5788

5889
The following are helpful resources for authoring articles:
5990

6091
* [Creating Quality Content (For Search Engines and People)](https://moz.com/blog/quality-blog-content)
6192
* [How to write effective documentation for your open source project](https://opensource.com/article/20/3/documentation)
62-
63-
## Review Process
64-
65-
This process is bootstrapped from the sig-docs blog [subproject](/sig-docs/blog-subproject/README.md). Please ask for review from community liaisons on the sig-docs-blog team or let the team in [#sig-contribex](https://kubernetes.slack.com/archives/C1TU9EB9S) know you need help.

communication/marketing-team/storytelling-resources/social-guidelines.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## General guidelines
66

7-
All messaging must be consistent with the values and principles of the project and the [ethos/vision of the team](./CHARTER.md#ethosvision). Messaging should be positive and uplifting. Be aware that sarcasm and/or jokes are generally hard to read over a medium such as social media.
7+
All messaging must be consistent with the values and principles of the project and the [ethos/vision of the team](/communication/marketing-team/CHARTER.md#ethosvision). Messaging should be positive and uplifting. Be aware that sarcasm and/or jokes are generally hard to read over a medium such as social media.
88

99
Original messages should come out of this teams' accounts at least twice a week (if not more). However, there should be no more than three tweets per hour (including retweets). Retweets, likes, and responses are unlimited, but they should be used thoughtfully to encourage inclusive and kind participation. Use scheduling software as needed to space out messages. All messages should serve a purpose: have an action and/or thumbnail image ("click link for details," "register today," etc. are example actions). Never include photos, user handles, or other personally identifiable information without explicit permission.
1010

communication/slack-config/channels.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ channels:
8484
- name: csi-secrets-store #this channel is for secrets-store-csi-driver which is a subproject of sig-auth
8585
- name: de-events
8686
- name: de-users
87+
- name: deppy-dev
8788
- name: devfile
8889
- name: devspace
8990
- name: devstats
@@ -110,6 +111,7 @@ channels:
110111
- name: external-secrets
111112
- name: falco
112113
- name: fiaas
114+
- name: finops
113115
- name: fi-users
114116
- name: flatcar
115117
- name: flink-operator
@@ -353,6 +355,7 @@ channels:
353355
- name: prometheus
354356
- name: prometheus-operator
355357
- name: prometheus-operator-dev
358+
- name: provider-oci
356359
- name: pt_br-users
357360
- name: purelb-users
358361
- name: raksh

communication/slack-config/usergroups.yaml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,11 +186,11 @@ usergroups:
186186
channels:
187187
- steering-committee
188188
members:
189+
- bentheelder
189190
- cblecker
190-
- dims
191191
- justaugustus
192-
- liggitt
193192
- mrbobbytables
193+
- palnabarun
194194
- paris
195195
- tpepper
196196

@@ -208,3 +208,19 @@ usergroups:
208208
- robshelly
209209
- vladimirmukhin
210210
- wurbanski
211+
212+
- name: devfile-devs
213+
long_name: Devfile Development Team
214+
description: Active developers of Devfile on #devfile
215+
channels:
216+
- devfile
217+
members:
218+
- elsony
219+
- johnmcollier
220+
- kim-tsao
221+
- maysunfaisal
222+
- michael-valdron
223+
- mike-hoang
224+
- rtaniwa
225+
- schultzp2020
226+
- yangcao77

communication/slack-config/users.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ users:
1919
Bart Farrell: U01DZM7PJDT
2020
bart0sh: U8VJC20R3
2121
benjaminapetersen: U0217E7EXV4
22+
bentheelder: U1P7T516X
2223
bhumijgupta: U022JUBM3B4
2324
briandealwis: UAZKM38JV
2425
bubblemelon: U7K9C643G
@@ -44,6 +45,7 @@ users:
4445
divya-mohan0209: UV4J7K97Z
4546
dougm: U8GG20UE9
4647
elezar: ULV21K3CH
48+
elsony: UCW8323KL
4749
enj: U2T4CVDTJ
4850
erismaster: U0162FJ79LY
4951
estroz: UKSEANEC9
@@ -79,6 +81,7 @@ users:
7981
joelanford: U1R6NQD8W
8082
joelsmith: U5SLG8T8F
8183
johnbelamaric: U246A1A0N
84+
johnmcollier: UCVS4TNMQ
8285
jonasrosland: U0A4G34S2
8386
jrsapi: U0DS2L6E8
8487
justaugustus: U0E0E78AK
@@ -87,6 +90,7 @@ users:
8790
katharine: UBTBNJ6GL
8891
katcosgrove: U01GDERGEHF
8992
kikisdeliveryservice: U9HFFRFT2
93+
kim-tsao: U02U1LDH4T1
9094
klihub: U9856A799
9195
klueska: UF3ARH55Y
9296
Kunal Kushwaha: UQ14U3NAY
@@ -100,10 +104,13 @@ users:
100104
markyjackson-taulia: U19TKJ64E
101105
MarlonGamez: U016N1XK06R
102106
mattmoyer: U0DRP8H42
107+
maysunfaisal: U01DEHK2YUB
103108
mbbroberg: U18JTHMDY
104109
micahhausler: U1WJ1BZA5
110+
michael-valdron: U03LXKVS0SX
105111
microwavables: UAF606ESE
106112
mik-dass: UCUULSG1W
113+
mike-hoang: U03PDV4LS1Z
107114
ming-qiu: U02JVSL5550
108115
mkorbi: UEBLUUA0P
109116
mohammedzee1000: U3PFFE8CD
@@ -135,11 +142,13 @@ users:
135142
rm3l: U034AQUV7PB
136143
rnapoles-rh: U01KDAMSWJD
137144
robshelly: U01LL4P09SR
145+
rtaniwa: U03K27HLHKN
138146
salaxander: UDHV1RXB2
139147
sammy: U8NJFL023
140148
sandipanpanda: U02A47HJ517
141149
saschagrunert: U53SUDBD4
142150
savitharaghunathan: UC8U2V3BM
151+
schultzp2020: U030K8UQA2G
143152
scott-seago: UHGD79E78
144153
sethmccombs: U92LLUZ8A
145154
shamus: US7EUUBK8
@@ -166,5 +175,6 @@ users:
166175
wurbanski: URX7CMK97
167176
xmudrii: U4Q2TNGVD
168177
xun-jiang: U02J0QC1VKJ
178+
yangcao77: U01D1VCNJQ3
169179
yinw: UMVD1GDCY
170180
zubron: U7G0KNS86

0 commit comments

Comments
 (0)