Skip to content

Commit 13f6934

Browse files
committed
Merge branch 'master' of https://github.com/kubernetes/community into sc-election-2020
2 parents ae6d23a + 6cbee5a commit 13f6934

File tree

64 files changed

+1775
-672
lines changed

Some content is hidden

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

64 files changed

+1775
-672
lines changed

.github/ISSUE_TEMPLATE/marketing-request.md

Lines changed: 10 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,23 @@ title: 'REQUEST: New communication about <topic>'
55
labels: area/contributor-comms, sig/contributor-experience
66
assignees:
77
---
8-
<!--
9-
ATTENTION: the Upstream Marketing Team have classifications on how urgent and important a message to the community is outlined here: https://git.k8s.io/community/communication/marketing-team/multichannel-communications.md#mapping-type-to-tier
108

11-
Filling out this form to the best of your ability will speed up the team's ability to get the word out!
12-
-->
9+
**What do you want send out?** (Please include a link to a draft)
10+
<!-- Gists, Hackmd.io, or Google Doc preferred. Include any artwork, pics, diagrams, or any other assets with public links.
1311
14-
**What do you want send out?**
15-
<!-- Include logos, artwork, pics, diagrams, or any other assets with public links whenever possible. -->
12+
We use a combination of mailing lists, Slack messages, and Twitter to get the word out. (Click the links below for more details.) -->
1613

1714

18-
**What’s the intended outcome?**
19-
<!-- Are you looking for people to get involved? Fill out a survey? See something of interest to them? Let us know why you care to share. -->
15+
- [] I agree that if this is urgent, I will @contributor-comms in #sig-contribex Slack.
16+
<!-- The team looks at these at least once a week during its meeting, but we're happy to help when a message is urgent. -->
2017

2118

22-
**What is the sponsoring SIG or community group?**
23-
<!-- What SIG or group is this message on behalf of? What is the best way to contact them? -->
19+
<!-- Want to learn more about Contributor Comms?
2420
25-
**Is this time-sensitive?**
26-
<!-- You can delete or skip this if it's not relevant. -->
21+
We started the Upstream Marketing Team to focus on contributor-to-contributor communication throughout Kubernetes.
2722
28-
- [ ] Yes, it is **due by** <$DATE> <$TIME>
29-
- [ ] Yes, it **must be sent** <$DATE> <$TIME>
30-
- [ ] No, but I'd prefer <$DATE> <$TIME>
23+
Read about our charter here: https://github.com/kubernetes/community/blob/master/communication/marketing-team/CHARTER.md
3124
32-
**Where do you want it to be visible?**
33-
<!-- Note that email via our mailing list is the default choice for all messages. See our
34-
multichannel communication strategy for more details. Note that blogs and social
35-
media must meet our guidelines.
25+
Or about the team: https://github.com/kubernetes/community/blob/master/communication/marketing-team
3626
37-
Multichannel communication strategy: http://git.k8s.io/community/communication/marketing-team/multichannel-communications.md#mapping-type-to-tier
38-
39-
Blog and Social Media Guidelines: https://git.k8s.io/community/communication/marketing-team#purpose -->
40-
41-
- [ ] Everywhere 🌍
42-
- [ ] Email ([email protected])
43-
- [ ] Blog post (with help from a [Storyteller](https://github.com/kubernetes/community/tree/master/communication/marketing-team#purpose))
44-
- [ ] Twitter (via [@k8scontributors](https://twitter.com/k8scontributors))
45-
- [ ] YouTube ([Kubernetes](https://www.youtube.com/channel/UCZ2bu0qutTOM0tHYa_jkIwg))
46-
- [ ] Slack (assumes `#kubernetes-dev` unless otherwise mentioned)
47-
- [ ] Contributor Calendar event entry (available [here](https://calendar.google.com/calendar/embed?src=calendar%40kubernetes.io))
48-
- [ ] Other (fill this out)
49-
50-
**Where is your first draft available?**
51-
<!-- Please provide a first draft of your message for all channels requested. Take your best shot and we are here to support you through getting it ready for publication (it's appreciated). Links to Google Docs or Hackmd.io pages are best for easy editing.
52-
53-
Also, include any social media tags of relevant people (e.g. Twitter handles of people you want to give a shout out on Twitter)-->
54-
55-
**Lastly, who's the best point of contact?**
56-
<!-- If you are the point of contact, please confirm it's you. Please include both GitHub username and Slack username. -->
27+
And thanks for reaching out! We're here to help. -->

.github/ISSUE_TEMPLATE/support.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ STOP -- PLEASE READ!
1010
1111
GitHub is not the right place for support requests.
1212
13-
If you're looking for help, check [Stack Overflow](https://stackoverflow.com/questions/tagged/kubernetes) and the [troubleshooting guide](https://kubernetes.io/docs/tasks/debug-application-cluster/troubleshooting/).
13+
If you're looking for help, check the [troubleshooting guide](https://kubernetes.io/docs/tasks/debug-application-cluster/troubleshooting/)
14+
or our [Discussion Forums](https://discuss.kubernetes.io).
1415
1516
You can also post your question on the [Kubernetes Slack](http://slack.k8s.io/) or the [Discuss Kubernetes](https://discuss.kubernetes.io/) forum.
1617

OWNERS_ALIASES

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ aliases:
5151
- ehashman
5252
- logicalhan
5353
sig-multicluster-leads:
54+
- jeremyot
5455
- pmorie
55-
- quinton-hoole
5656
sig-network-leads:
5757
- caseydavenport
5858
- dcbw
@@ -72,6 +72,11 @@ aliases:
7272
sig-scheduling-leads:
7373
- Huang-Wei
7474
- ahg-g
75+
sig-security-leads:
76+
- aasmall
77+
- cji
78+
- jaybeale
79+
- joelsmith
7580
sig-service-catalog-leads:
7681
- jberkhahn
7782
- mszostok
@@ -118,10 +123,6 @@ aliases:
118123
- quinton-hoole
119124
- tpepper
120125
- youngnick
121-
wg-machine-learning-leads:
122-
- k82cn
123-
- kow3ns
124-
- vishh
125126
wg-multitenancy-leads:
126127
- srampal
127128
- tashimi
@@ -149,10 +150,10 @@ aliases:
149150
- phenixblue
150151
committee-code-of-conduct:
151152
- AevaOnline
152-
- Bradamant3
153-
- carolynvs
154-
- jdumars
153+
- celestehorgan
154+
- karenhchu
155155
- tashimi
156+
- tpepper
156157
committee-product-security:
157158
- cjcullen
158159
- cji

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,3 @@ contributors/guide/README.md#find-something-to-work-on
7272
[open a pull request]:
7373
contributors/guide/README.md#open-a-pull-request
7474
[Community Membership]:/community-membership.md
75-
76-
![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/CONTRIBUTING.md?pixel)
File renamed without changes.

committee-code-of-conduct/README.md

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
1414

1515
## Members
1616

17-
* Aeva van der Veen (**[@AevaOnline](https://github.com/AevaOnline)**), Microsoft
18-
* Jennifer Rondeau (**[@Bradamant3](https://github.com/Bradamant3)**), Stripe
19-
* Carolyn Van Slyck (**[@carolynvs](https://github.com/carolynvs)**), Microsoft
20-
* Jaice Singer DuMars (**[@jdumars](https://github.com/jdumars)**), Apple
17+
* Aeva Black (**[@AevaOnline](https://github.com/AevaOnline)**), Microsoft
18+
* Celeste Horgan (**[@celestehorgan](https://github.com/celestehorgan)**), CNCF
19+
* Karen Chu (**[@karenhchu](https://github.com/karenhchu)**), Microsoft
2120
* Tasha Drew (**[@tashimi](https://github.com/tashimi)**), VMware
21+
* Tim Pepper (**[@tpepper](https://github.com/tpepper)**), VMware
2222

2323
## Contact
2424
- Private Mailing List: [email protected]
@@ -32,16 +32,27 @@ The [charter](charter.md) defines the scope and governance of the Code of Conduc
3232

3333
The members and their terms are as follows:
3434

35-
### Term ends on August 7, 2020
36-
- Jaice Singer Dumars (Google)
37-
- Jennifer Rondeau (Stripe)
38-
- Carolyn Van Slyck (Microsoft)
39-
4035
### Term ends on August 7, 2021
41-
- Aeva van der Veen (Microsoft)
42-
- Tasha Drew (VMWare)
36+
37+
- Aeva Black (Microsoft)
38+
- Tasha Drew (VMware)
39+
40+
### Term ends on August 7, 2022
41+
42+
- Karen Chu (Microsoft)
43+
- Celeste Horgan (CNCF)
44+
- Tim Pepper (VMware)
4345

4446
Please see the [bootstrapping document](./bootstrapping-process.md) for more information on how members are picked, their responsibilities, and how the committee will initially function.
4547

48+
## Emeritus Committee Members
49+
50+
The Code of Conduct Committee sincerely thanks our emeritus committee members for their contributions.
51+
52+
- Jaice Singer Dumars (Google)
53+
- Jennifer Rondeau (Stripe)
54+
- Carolyn Van Slyck (Microsoft)
55+
- Paris Pittman (Apple)
56+
4657
_More information on conflict resolution process to come in the near future. For now, any Code of Conduct or Code of Conduct Committee concerns can be directed to <[email protected]>_.
4758
<!-- END CUSTOM CONTENT -->

committee-code-of-conduct/charter.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ authority and enforcement to this committee. The committee can, at its
6565
discretion, delegate some authority to those tasked with enforcement.*
6666

6767
## Election
68-
TODO: Our election processes will be outlined in a separate document, coming soon.
68+
69+
See [elections](https://github.com/kubernetes/community/blob/master/committee-code-of-conduct/election.md)
6970

7071
## Committee Operation
7172
The committee strives to respond quickly to reports, as well as initiate

committee-product-security/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ The Kubernetes Product Security Committee is the body that is responsible for re
1414
## Members
1515

1616
* CJ Cullen (**[@cjcullen](https://github.com/cjcullen)**), Google
17-
* Craig Ingram (**[@cji](https://github.com/cji)**), Salesforce
17+
* Craig Ingram (**[@cji](https://github.com/cji)**), Stripe
1818
* Joel Smith (**[@joelsmith](https://github.com/joelsmith)**), Red Hat
1919
* Luke Hinds (**[@lukehinds](https://github.com/lukehinds)**), Red Hat
2020
* Micah Hausler (**[@micahhausler](https://github.com/micahhausler)**), Amazon

committee-steering/governance/sig-governance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ Issues impacting multiple subprojects in the SIG should be resolved by either:
226226
[forums provided]: /communication/README.md
227227
[lazy-consensus]: http://en.osswiki.info/concepts/lazy_consensus
228228
[super-majority]: https://en.wikipedia.org/wiki/Supermajority#Two-thirds_vote
229-
[KEP]: https://git.k8s.io/enhancements/keps/YYYYMMDD-kep-template.md
229+
[KEP]: https://git.k8s.io/enhancements/keps/NNNN-kep-template/README.md
230230
[sigs.yaml]: https://github.com/kubernetes/community/blob/master/sigs.yaml
231231
[OWNERS]: contributors/devel/owners.md
232232
[SIG Charter process]: https://git.k8s.io/community/committee-steering/governance/README.md

communication/mailing-list-guidelines.md

Lines changed: 118 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -85,33 +85,124 @@ additions.
8585

8686
## Mailing list creation
8787

88-
Create a Google Group at https://groups.google.com/forum/#!creategroup,
89-
following the below procedure:
90-
- Each SIG must have two discussion groups with the following settings.
91-
- `kubernetes-sig-<foo>` (the discussion group):
92-
- Group type: Email list
93-
- Group visibility: Anyone on the web
94-
- View topics: Anyone on the web
95-
- Post: Owners of the group, Managers of the group, All members of the group. Ensure that "Anyone on the web" is NOT selected here.
96-
- Join the group: Anyone on the web
97-
- `kubernetes-sig-<foo>-leads` (list for the leads, to be used with Zoom and
98-
Calendars)
99-
- Group type: Email list
100-
- Group visibility: All members of the group
101-
- View topics: All members of the group
102-
- Post: Owners of the group, Managers of the group, All members of the group. Ensure that "Anyone on the web" is NOT selected here.
103-
- Join the group: Only invited users
104-
105-
- Groups should be created as e-mail lists with at least three owners and must
106-
include the [Mailing list owners](#mailing-list-owners).
107-
- To add the owners, visit the **Group Settings** (drop-down menu on the right
108-
side), select **Members**, then **Direct Add Members** on the left side and add them via their email address (with a suitable welcome message). Do NOT forget to invite [email protected] in addition to your leads.
109-
- In **Members/All Members** select the [Mailing list owners] and assign them
110-
to the **owner role**.
111-
- Set the following permissions to **Public**:
112-
- **View topics**
113-
- **Post**
114-
- **Join the Group**
88+
All SIGs and WGs need two discussion groups: one for leads/chairs, and one for members.
89+
90+
### Prerequisites
91+
92+
- An email account that can create google groups and add members external to your organization to a google group mailing list. **This might not be possible with your employer's email account**. You might need to use a personal email account.
93+
- At least 3 mailing list owners (leads), in addition to [email protected]
94+
- Familiarity with the [moderation guidelines] for the project and [moderation queue]s. Chairs should be cognizant that a new group will require
95+
an initial time investment moderation-wise as the group establishes itself.
96+
97+
98+
### Create the leads and members mailing lists
99+
100+
> **Note:** You will need follow these steps twice! Once for the leads mailing list, and again for the members mailing list.
101+
102+
1. Navigate to https://groups.google.com/forum/#!creategroup and fill out the **Enter group info** form as follows:
103+
104+
| Field | Leads ML value | Members ML value |
105+
| --- | --- | --- |
106+
| **Group name** | `kubernetes-sig-<foo>-leads` | `kubernetes-sig-<foo>` |
107+
| **Group email address** | Leave as-is | Leave as-is
108+
| **Group description** | Leads ML for Kubernetes SIG Foo | Members ML for Kubernetes SIG Foo |
109+
110+
Click **Next**.
111+
2. Fill out the the **Choose privacy settings** with these options:
112+
113+
| Field | Leads ML value | Members ML value |
114+
| --- | --- | --- |
115+
| **Who can see the group** | Group members | Anyone on the web |
116+
| **Who can join group** | Invited users only | Anyone on the web |
117+
| **Who can view conversations** | Group members | Anyone on the web |
118+
| **Who can post** | Anyone on the web | Anyone on the web |
119+
| **Who can view members** | Group members | Group members |
120+
121+
Click **Next**.
122+
123+
3. Fill out the **Add members** form as follows:
124+
125+
| Field | Leads ML value | Members ML value |
126+
| --- | --- | --- |
127+
| **Group owners** | All SIG/WG leads and [email protected] | All SIG/WG leads and [email protected] |
128+
129+
> **Note:** You can add new owners to a mailing list at any time in the **People > Members** screen.
130+
131+
Leave all other fields as-is. Click **Next.**
132+
133+
4. Once the group is created, navigate to your group in the Google Groups UI and go to **Group settings** to continue setting up permissions. Set the following settings:
134+
135+
**Member Privacy**
136+
137+
| Field | Leads ML value | Members ML value |
138+
| --- | --- | --- |
139+
| **Identification required for new members** | Either display name or Google profile | Either display name or Google profile |
140+
| **Who can view the member's email addresses?** | Group managers | Group managers |
141+
142+
**Posting policies**
143+
144+
| Field | Leads ML value | Members ML value |
145+
| --- | --- | --- |
146+
| **Conversation history** | On | On |
147+
| **Who can moderate content** | Group managers | Group managers |
148+
| **Who can moderate metadata** | Group members | Group members |
149+
| **Who can post as the group** | Group owners | Group owners |
150+
| **Message moderation** | No moderation | Moderate messages from non-members |
151+
| **New member restrictions** | No posting restriction for new members | New member posts are moderated |
152+
153+
**Email options**
154+
155+
| Field | Leads ML value | Members ML value |
156+
| --- | --- | --- |
157+
| **Subject prefix** | `[k8s-sig-<foo>-leads]` | `[k8s-sig-<foo>]` |
158+
| **Email footer** | Include the standard Groups footer | Include the standard Groups footer |
159+
| **Group email language** | English (or your group's default language) | English (or your group's default language) |
160+
161+
**Member moderation**
162+
163+
| Field | Leads ML value | Members ML value |
164+
| --- | --- | --- |
165+
| **Who can manage members** | Group managers | Group managers |
166+
| **Who can adjust roles** | Group managers | Group managers
167+
168+
5. Click **Save changes**.
169+
170+
171+
172+
173+
174+
## Set up shared calendars and meeting with a mailing list
175+
176+
Once you've set up your SIG/WG mailing list, you'll need to:
177+
- Share a calendar with meeting invites on it with the mailing list
178+
- Share a meeting notes google doc with the mailing list
179+
180+
### Prerequisites
181+
182+
- A member's google group.
183+
- A shared calendar.
184+
> **Note:** Like with mailing lists, your organization's permissions might not let you share calendars with the correct permissions. You might need to use a personal email address.
185+
186+
### Sharing the calendar with the google group
187+
188+
You must share the meeting calendar with the following people:
189+
- All leads (individually)
190+
- The kubernetes-sig-foo-leads mailing list
191+
192+
- The kubernetes-sig-foo (members) mailing list
193+
194+
1. In Google Calendar, click on the calendar's **...** menu and select **Settings and sharing**.
195+
2. In **Access permissions**, check **Make available to public**.
196+
3. Under **Share with specific people, do the following:**
197+
- For each lead, [email protected], and [email protected]:
198+
1. Add their email
199+
2. Give them the permission **Make changes and manage sharing**.
200+
- For [email protected], add them and give them the permission **See all event details**.
201+
202+
> **Note:** You need to add the member's mailing list as a guest to any meeting invites on the shared calendar for an invite to be sent to members of the group.
203+
204+
## Sharing the meeting notes with the google group
205+
115206
- Create and share your _"meeting notes"_ Google doc with the following
116207
permissions settings:
117208
- **Can edit** for members of the newly created Mailing List.
@@ -121,32 +212,6 @@ following the below procedure:
121212
document should be copied over to an account without the restriction and
122213
include the owner reference at the top of the document.
123214

124-
Familiarize yourself with the [moderation guidelines] for the project and create
125-
a [moderation queue]. Chairs should be cognizant that a new group will require
126-
an initial time investment moderation-wise as the group establishes itself.
127-
128-
### Visibility
129-
130-
If you need to ensure that an existing group is visible to the internet.
131-
132-
Near the top right, click **Manage group**.
133-
- **Information** -> **Group Visibility** -> **Edit the setting to set the desired visibility for your group.** -> **Save**.
134-
135-
### Create moderation queue
136-
137-
The moderation queue will direct all new user messages to the a moderation
138-
queue before being posted to the Mailing List.
139-
140-
- From the Google Groups management page goto **Settings** -> **Moderation**.
141-
- Configure the following settings:
142-
- Leave "Moderate all messages to the group" off
143-
- New member restrictions: New member posts are moderated
144-
- Rejected author notification: Checked, use this text:
145-
```
146-
Since you're a new subscriber you're in a moderation queue, sorry for the inconvenience, a moderator will check your message shortly.
147-
```
148-
- Spam messages: Send them to moderation queue and send notification to moderators.
149-
150215
### Archive a mailing list
151216

152217
To archive a mailing list, use the below procedure.

0 commit comments

Comments
 (0)