Skip to content

Commit 29ba16f

Browse files
authored
Merge branch 'kubernetes:master' into update-comms-issue-template
2 parents d5982af + d8d3aec commit 29ba16f

File tree

279 files changed

+42848
-581
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+42848
-581
lines changed

OWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ filters:
55
approvers:
66
- cblecker
77
- idvoretskyi
8-
- jdumars
98
- mrbobbytables
109
- nikhita
1110
- parispittman
1211
- sig-contributor-experience-leads
1312
- committee-steering
1413
emeritus_approvers:
14+
- jdumars
1515
- alisondy
1616
- castrojo
1717
- calebamiles

OWNERS_ALIASES

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ aliases:
2727
- mpuckett159
2828
- soltysh
2929
sig-cloud-provider-leads:
30-
- andrewsykim
3130
- bridgetkromhout
3231
- cheftako
3332
- elmiko
34-
- nckturner
3533
sig-cluster-lifecycle-leads:
3634
- fabriziopandini
3735
- justinsb
@@ -44,6 +42,7 @@ aliases:
4442
- palnabarun
4543
sig-docs-leads:
4644
- divya-mohan0209
45+
- katcosgrove
4746
- natalisucks
4847
- reylejano
4948
- salaxander
@@ -65,7 +64,7 @@ aliases:
6564
- upodroid
6665
sig-multicluster-leads:
6766
- jeremyot
68-
- pmorie
67+
- skitt
6968
sig-network-leads:
7069
- aojea
7170
- danwinship
@@ -131,6 +130,12 @@ aliases:
131130
- johnbelamaric
132131
- klueska
133132
- pohly
133+
wg-etcd-operator-leads:
134+
- ahrtr
135+
- hakman
136+
- jberkus
137+
- jmhbnz
138+
- justinsb
134139
wg-lts-leads:
135140
- jeremyrickard
136141
- liggitt
@@ -191,4 +196,8 @@ aliases:
191196
provider-vmware:
192197
- cantbewong
193198
- frapposelli
199+
sig-release-subproject-leads:
200+
- gracenng
201+
- katcosgrove
202+
- xmudrii
194203
## END CUSTOM CONTENT

committee-steering/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ The [charter](https://git.k8s.io/steering/charter.md) defines the scope and gove
2323

2424
* Benjamin Elder (**[@BenTheElder](https://github.com/BenTheElder)**), Google
2525
* Stephen Augustus (**[@justaugustus](https://github.com/justaugustus)**), Cisco
26-
* Bob Killen (**[@mrbobbytables](https://github.com/mrbobbytables)**), Google
26+
* Bob Killen (**[@mrbobbytables](https://github.com/mrbobbytables)**), Cloud Native Computing Foundation
2727
* Paco Xu 徐俊杰 (**[@pacoxu](https://github.com/pacoxu)**), DaoCloud
2828
* Nabarun Pal (**[@palnabarun](https://github.com/palnabarun)**), VMware
2929
* Patrick Ohly (**[@pohly](https://github.com/pohly)**), Intel

communication/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
reviewers:
4-
- jdumars
54
- idvoretskyi
65
- jeefy
76
- mrbobbytables
@@ -10,6 +9,7 @@ approvers:
109
- mrbobbytables
1110
- sig-contributor-experience-leads
1211
emeritus_approvers:
12+
- jdumars
1313
- castrojo
1414
- parispittman
1515
labels:

communication/calendar-guidelines.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ addition of [gsuite], this practice may change soon.
6767
will need to be set to "public".
6868
- In the calendar invite body - include your meeting notes, zoom information,
6969
and any other pertinent information that you want your group to know.
70+
- Invite `[email protected]` so the event will appear in https://www.kubernetes.dev/resources/calendar/
7071

7172

7273
### Testing Permissions
Lines changed: 94 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,94 @@
1+
# Contributor Comms Blogging: Shadow Guide
2+
3+
Contribex Comms has leads for different areas, specifically for
4+
blogging where there's a Blogging Lead that takes additional
5+
responsibility for making sure that the blogging process not only
6+
works as expected, but is constantly being improved to better serve the
7+
goals in the [SIG charter](./CHARTER.md).
8+
9+
Roles in SIG Contribex Comms are part of a journey where each
10+
individual learns and teaches, improves on what exists and eventually
11+
moves forward to other challenges; for this to work, it's fundamental
12+
to develop leadership skills in the community, and one way of doing it is
13+
through a shadow program.
14+
15+
This document briefly describes the shadowing program, including the
16+
tasks that are expected from shadows. It is hoped that this extra
17+
level of detail helps shadows in their path towards additional
18+
responsibilities in the team.
19+
20+
21+
## Shadow Program Goals
22+
23+
It's important to highlight that anyone is welcome to contribute with
24+
ideas and write articles _without being a shadow_, and the shadowing
25+
program is not meant to change that, but to enable it by guaranteeing
26+
that there's the availability to assist contributors that want to
27+
participate; writing and publishing articles requires a mix of
28+
technical and non-technical knowledge that shouldn't be an obstacle
29+
for participation. The Blogging Lead helps with that, and the
30+
shadowing program is meant to:
31+
32+
* Open up additional venues for participation for those in the community.
33+
* Provide a more structured way for anyone interested in the blogging
34+
side of things to learn by doing.
35+
* Maintain a pipeline of potential Blogging Leads.
36+
37+
## Shadowing candidates
38+
39+
Anyone is welcome to display their interest in becoming a shadow for
40+
the blogging team. For practical purposes, the team is limited to 4
41+
shadows to allow an adequate exposure to the tasks in a reasonable
42+
period of time.
43+
44+
Anyone interested in being a shadow should indicate that desire to the
45+
Blogging Lead, who will help in making sure that the candidate is
46+
aware of the expected commitment. The main requirement for shadowing
47+
is a willingness to participate actively and consistently.
48+
49+
While not requirements, the following are things that will be a part
50+
of the work expected from shadows, so any existing mastery of them is
51+
certainly a plus:
52+
53+
* Knowledge of git and GitHub (issues, PRs, reviews, merges, etc)
54+
* Knowledge of the existing blogging standards, including the ones
55+
external to SIG Contribex Comms (like the [SIG Docs standards](https://kubernetes.io/docs/contribute/style/style-guide/))
56+
* Participation in the weekly SIG Contribex Comms meetings
57+
58+
In terms of time requirements, this is a very flexible programme since
59+
writing articles is something that can be done asynchronously. The
60+
following provides a minimal guideline:
61+
62+
* 1h for weekly participation in the SIG Contribex Comms meeting
63+
* 2h per week for working on the interviews and articles (reviewing,
64+
writing, etc).
65+
66+
67+
## Shadowing Program
68+
69+
The first stage is mostly about helping and getting to know the
70+
process, and it includes:
71+
72+
* Assist in reviewing an article: the shadow will review an article
73+
and provide suggestions to improve it.
74+
* Assist in writing an interview: the shadow will suggest questions
75+
and improvements to an existing interview script.
76+
* Assist in a GitHub PR review: the shadow will partipate in a GitHub
77+
discussion during the publishing process.
78+
* Help contributors: the shadow will reply to contributors in the team
79+
Slack channel, steering them in the right direction.
80+
* Propose a new topic: the shadow will identify new interesting
81+
articles and add them to the project board.
82+
83+
The following stage includes tasks that require more direct
84+
involvement:
85+
86+
* Write an interview script.
87+
* Open an Issue and a PR to publish the completed article.
88+
* Carry an article from inception to publication, updating the project
89+
board and providing updates in the Slack channel throughout the
90+
article lifecycle.
91+
* Provide feedback during weekly meetings.
92+
93+
This is not an exhaustive list, but it serves as an indicator of what
94+
a shadow will be exposed to, and what will they be expected to do.

communication/meeting-notes-archive/201902-201911_Community_Meeting_Notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1668,7 +1668,7 @@ Twitter | [Sep 19th](https://twitter.com/stephenaugustus/status/1174797710043430
16681668

16691669
* Announcements
16701670
* WG LTS Survey ending on April 26th.
1671-
* This survey was created by the[ LTS Working Group](http://git.k8s.io/community/wg-lts) of the Kubernetes project. The purpose of this survey is to understand the challenges faced by various types of stakeholders with respect to the current release cadence of Kubernetes project. The survey questions are classified based on the stakeholder category.
1671+
* This survey was created by the[ LTS Working Group](https://git.k8s.io/community/wg-lts) of the Kubernetes project. The purpose of this survey is to understand the challenges faced by various types of stakeholders with respect to the current release cadence of Kubernetes project. The survey questions are classified based on the stakeholder category.
16721672
* [https://www.surveymonkey.com/r/kubernetes-support-survey-2019](https://www.surveymonkey.com/r/kubernetes-support-survey-2019)
16731673
* We now have a `#pr-reviews` slack channel as a last resort if your PR is stuck. We would love to have folks who can triage/review as well to join the channel to help wither fellow contributors. The idea is to help get someone get a PR “ready” and get the right SIGs/Reviewers/Approvers involved.
16741674
* **👏 **Shoutouts this week (Check in #shoutouts on slack) **👏**
@@ -2325,6 +2325,6 @@ Twitter | [Sep 19th](https://twitter.com/stephenaugustus/status/1174797710043430
23252325
* bentheelder - Shoutout to @jeefy for the really shiny and useful looking structured Kubernetes release notes viewer demo in today's #sig-release meeting, looking forward to seeing more about this!
23262326
* Maria - shoutout to Silvia Moura Pina (@smourapina) for putting together a workflow to enable the CI signal subteam of the release team keep on top of flagging issues from e2e tests and coordinate follow-ups and to Jorge Alarcon (@Jorge) for spotting an opportunity to offer broader transparency to what the CI signal team is working on, suggesting a structure and kicking off implementation (find current version at [https://github.com/orgs/kubernetes/projects/11](https://github.com/orgs/kubernetes/projects/11))
23272327
* spiffxp - shouts to Josh Berkus (@jberkus) for taking notes during today’s steering committee meeting, our google doc clearly becomes way more difficult to use with so many people looking at it, and the written record is invaluable
2328-
* spiffxp - shoutout to Katharine Berry (@Katharine) for moving us from gubernator to spyglass for all of our test result viewing needs! [https://git.k8s.io/test-infra/prow/spyglass ](https://git.k8s.io/test-infra/prow/spyglass)
2328+
* spiffxp - shoutout to Katharine Berry (@Katharine) for moving us from gubernator to spyglass for all of our test result viewing needs! [https://sigs.k8s.io/prow/pkg/spyglass ](https://sigs.k8s.io/prow/pkg/spyglass)
23292329
* codenrhoden - Shoutout to Michelle Au (@msau42) for her patience and helpful guidance in getting a very large PR merged!
23302330
* @strebel - @jeefy and @onyiny-ang for all their awesome work on the Release-Notes team for 1.14. Especially @jeefy’s work on the Release-Notes website concept

communication/meeting-notes-archive/201911-202010_Community_Meeting_Notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ I want to call out [@karenb](https://kubernetes.slack.com/team/UCLQ9GKSP) dealin
961961
* People start to depend on non-ga beta things
962962
* Timebox amount of time a feature is allowed to stay in beta.
963963
* [Plan to set up CI to ensure conformance coverage](https://github.com/kubernetes/enhancements/pull/1306)
964-
* [Plan to eliminate dependencies on non-GA features in conformance](http://git.k8s.io/enhancements/keps/sig-architecture/20191023-conformance-without-beta.md)
964+
* [Plan to eliminate dependencies on non-GA features in conformance](https://git.k8s.io/enhancements/keps/sig-architecture/1333-conformance-without-beta/README.md)
965965
* Started a “KEP reading group”
966966
* Team collectively reads KEPs and discusses them in meetings
967967
* Code organization

communication/moderators.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ communication channels and their home time zone. See our
2525
- [YouTube Channel](#youtube-channel)
2626
- [Owners](#owners)
2727
- [Primary Moderators](#primary-moderators-1)
28-
- [Moderators Pro Tempore](#moderators-pro-tempore-1)
28+
- [Backup Moderators](#backup-moderators)
2929
- [Slack](#slack)
3030
- [Owner](#owner)
3131
- [Moderators](#moderators)
32-
- [Moderators Pro Tempore](#moderators-pro-tempore-2)
32+
- [Moderators Pro Tempore](#moderators-pro-tempore-1)
3333
- [Zoom](#zoom)
3434

3535
## Mailing Lists
@@ -149,10 +149,9 @@ Moderators seats: 6
149149
| Chris Short | @chrisshort | Americas | [ET - Eastern Time (US East Coast)](https://time.is/ET) |
150150
| Nigel Brown | @nigel | Americas | [CT - Central Time (US Central)](https://time.is/CT) |
151151
| Pritish Samal | @Pritish | APAC | [IST - Indian Standard Time](https://time.is/IST) |
152-
| _Open_ | _Open_ | _Open_ | _Open_ |
152+
| Chad Crowell | @chadmcrowell | Americas | [CT - Central Time (US Central)](https://time.is/CT) |
153153
| _Open_ | _Open_ | _Open_ | _Open_ |
154154

155-
156155
### Backup Moderators
157156

158157
| Name | Kubernetes Slack ID | Region | Timezone |
@@ -161,7 +160,6 @@ Moderators seats: 6
161160
| Bob Killen | @mrbobbytables | Americas | [ET - Eastern Time (US East Coast)](https://time.is/ET) |
162161
| Taylor Dolezal | @onlydole | Americas | [PT - Pacific Time (US West Coast)](https://time.is/PT) |
163162

164-
165163
## Slack
166164

167165
### Owner

communication/slack-config/channels.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ channels:
7171
archived: true
7272
- name: cluster-api-gcp
7373
- name: cluster-api-ibmcloud
74+
- name: cluster-api-ionoscloud
7475
- name: cluster-api-k3s
7576
- name: cluster-api-kubemark
7677
- name: cluster-api-kubevirt
@@ -170,6 +171,7 @@ channels:
170171
- name: hephy-users
171172
id: C678BMZ89
172173
- name: hetzner
174+
- name: hmc-dev
173175
- name: homelab
174176
- name: hydrophone
175177
- name: id-events
@@ -265,6 +267,7 @@ channels:
265267
- name: kubeapps
266268
- name: kubebuilder
267269
- name: kubecon
270+
- name: kubecfg
268271
- name: kubectl-trace
269272
- name: kubectl-validate
270273
- name: kubedb
@@ -321,6 +324,7 @@ channels:
321324
- name: litmus-dev
322325
- name: lokomotive
323326
archived: true
327+
- name: lula-dev
324328
- name: magnum-cluster-api
325329
- name: malaysia-users
326330
- name: malta-users
@@ -551,6 +555,7 @@ channels:
551555
- name: wg-data-protection
552556
- name: wg-device-management
553557
id: C0409NGC1TK
558+
- name: wg-etcd-operator
554559
- name: wg-iot-edge
555560
- name: sig-k8s-infra
556561
id: CCK68P2Q2

0 commit comments

Comments
 (0)