Skip to content

Commit fae691e

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

File tree

20 files changed

+249
-203
lines changed

20 files changed

+249
-203
lines changed

OWNERS_ALIASES

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,8 @@ aliases:
7373
- Huang-Wei
7474
- ahg-g
7575
sig-security-leads:
76-
- aasmall
77-
- cji
78-
- jaybeale
79-
- joelsmith
76+
- iancoldwater
77+
- tabbysable
8078
sig-service-catalog-leads:
8179
- jberkhahn
8280
- mszostok

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,9 @@ We encourage all contributors to become members. We aim to grow an active, healt
6666
[Contributor Guide]:
6767
contributors/guide/README.md
6868
[file an issue]:
69-
/contributors/guide/README.md#file-an-issue
69+
contributors/guide/first-contribution.md#file-an-issue
7070
[find something to work on]:
71-
contributors/guide/README.md#find-something-to-work-on
71+
contributors/guide/first-contribution.md#find-something-to-work-on
7272
[open a pull request]:
73-
contributors/guide/README.md#open-a-pull-request
73+
contributors/guide/contributing.md#opening-a-pull-request
7474
[Community Membership]:/community-membership.md

communication/slack-config/restrictions.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ restrictions:
2929
- "^sig-release$"
3030
- "^release-"
3131
usergroups:
32+
- "^sig-release-"
3233
- "^release-"
3334
- path: "sig-network/*.yaml"
3435
channels:

communication/slack-config/sig-docs/docs-channels.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ channels:
2323
- name: sig-docs-maintainers
2424
- name: sig-docs-modeling
2525
- name: sig-docs-release
26+
archived: true
2627
- name: sig-docs-security
2728
archived: true
2829
- name: sig-docs-tools

communication/slack-config/sig-release/usergroups.yaml

Lines changed: 32 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,23 @@ usergroups:
1515
- cpanato # Release Manager
1616
- dougm # Release Manager
1717
- feiskyer # Release Manager
18+
- gianarb # Release Manager Associate
1819
- hasheddan # Release Manager
1920
- hoegaarden # Release Manager
2021
- idealhack # Release Manager
2122
- jimangel # Release Manager Associate
2223
- justaugustus # subproject owner / Release Manager
23-
- markyjackson-taulia # Release Manager Associate
24-
- saschagrunert # Release Manager
24+
- mkorbi # Release Manager Associate
25+
- onlydole # Release Manager Associate
26+
- puerco # Release Manager Associate
27+
- saschagrunert # subproject owner / Release Manager
2528
- sethmccombs # Release Manager Associate
2629
- tpepper # subproject owner / Release Manager
2730
- Verolop # Release Manager Associate
28-
- xmudrii # Release Manager Associate
31+
- xmudrii # Release Manager
2932

3033
# Should match the Release Team Leads of the current cycle and SIG Chairs at all times
31-
# Current release cycle: https://git.k8s.io/sig-release/releases/release-1.19/release_team.md
34+
# Current release cycle: https://git.k8s.io/sig-release/releases/release-1.20/release_team.md
3235
- name: release-team-leads
3336
long_name: Release Team Leads
3437
description: Release Team Leads. Ping for questions on the current Kubernetes release cycle.
@@ -41,10 +44,28 @@ usergroups:
4144
- release-notes
4245
- sig-release
4346
members:
44-
- alejandrox1 # SIG Technical Lead
45-
- jeremyrickard # 1.19 Release Team Lead Shadow
46-
- justaugustus # SIG Chair
47-
- mrbobbytables # 1.19 Release Team Lead Shadow
48-
- onlydole # 1.19 Release Team Lead
49-
- saschagrunert # SIG Technical Lead
50-
- tpepper # SIG Chair
47+
- alejandrox1 # SIG Release Technical Lead
48+
- hasheddan # 1.20 Release Team Lead Shadow
49+
- jeremyrickard # 1.20 Release Team Lead
50+
- justaugustus # SIG Release Chair
51+
- LappleApple # SIG Release Program Manager
52+
- palnabarun # 1.20 Release Team Lead Shadow
53+
- saschagrunert # SIG Release Technical Lead
54+
- savitharaghunathan # 1.20 Release Team Lead Shadow
55+
- tpepper # SIG Release Chair
56+
57+
# Should match SIG Release Leads at all times:
58+
# https://git.k8s.io/community/sig-release/README.md#leadership
59+
- name: sig-release-leads
60+
long_name: SIG Release Leads
61+
description: SIG Release Leads. Ping for questions on SIG Release process and escalations.
62+
channels:
63+
- release-ci-signal
64+
- release-management
65+
- sig-release
66+
members:
67+
- alejandrox1 # SIG Release Technical Lead
68+
- justaugustus # SIG Release Chair
69+
- LappleApple # SIG Release Program Manager
70+
- saschagrunert # SIG Release Technical Lead
71+
- tpepper # SIG Release Chair

communication/slack-config/users.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ users:
1515
cpanato: U8DFY4TTK
1616
dougm: U8GG20UE9
1717
feiskyer: U0ASA4398
18+
gianarb: U0FSCELCR
1819
hasheddan: ULLQEF30C
1920
hoegaarden: U7VA4RZS9
2021
idealhack: U5NJ3DQM9
@@ -28,9 +29,11 @@ users:
2829
justaugustus: U0E0E78AK
2930
kaslin: U5ENKU0AE
3031
katharine: UBTBNJ6GL
32+
LappleApple: U011C07244F
3133
listx: UFCU8S8P3
3234
markyjackson-taulia: U19TKJ64E
3335
mbbroberg: U18JTHMDY
36+
mkorbi: UEBLUUA0P
3437
mrbobbytables: U511ZSKHD
3538
nikhita: U2PQHGMLN
3639
nrb: U7S597E00
@@ -40,10 +43,12 @@ users:
4043
paris: U5SB22BBQ
4144
pensu91: U44FHF81G
4245
phenixblue: UB4UVLEAK
46+
puerco: ULGHLJ7TP
4347
rajula96reddy: U7K9EK1HC
4448
Rin Oliver: USF4LMDCN
4549
sammy: U8NJFL023
4650
saschagrunert: U53SUDBD4
51+
savitharaghunathan: UC8U2V3BM
4752
sethmccombs: U92LLUZ8A
4853
simplytunde: UAY1NBYHE
4954
Sujay Pillai: UBW3N1VGW

contributors/guide/contributing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ description: |
99

1010
- [Communication](#communication)
1111
- [GitHub workflow](#github-workflow)
12-
- [Open a Pull Request](#open-a-pull-request)
12+
- [Open a Pull Request](#opening-a-pull-request)
1313
- [Code Review](#code-review)
1414
- [Best Practices](#best-practices)
1515
- [Testing](#testing)

mentoring/programs/README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,4 @@
22

33
## Meetings
44

5-
APAC friendly time is, Monday at 20:30, every second and fourth week of the month
6-
EU/NA friendly time is, Tuesdays at 08:30, every second and fourth week of the month
7-
8-
Details can be found on the Contribex community calendar [here](https://calendar.google.com/calendar/embed?src=calendar%40kubernetes.io)
5+
Currently, the mentoring meeting happens in conjunction with the New Contributor Workshop meeting which is held bi-weekly on Monday at 16:00.

mentoring/programs/office-hours.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
title: Office Hours/ Mentoring
22

3-
* API Machinery -
4-
* [Kubebuilder and Controller Runtime Meeting - Second Wednesday every month at 10:00 PT (Pacific Time)](https://docs.google.com/document/d/1Ih-2cgg1bUrLwLVTB9tADlPcVdgnuMNBGbUl4D-0TIk/edit?usp=sharing)
5-
* Architecture -
3+
* API Machinery -
4+
* [Kubebuilder and Controller Runtime Meeting - Biweekly Thursday at 09:00 PT (Pacific Time)](https://docs.google.com/document/d/1Ih-2cgg1bUrLwLVTB9tADlPcVdgnuMNBGbUl4D-0TIk/edit?usp=sharing)
5+
* Architecture -
66
* [Production Readiness Office Hours - Biweekly Wednesday at 12:00 PT (Pacific Time)](https://docs.google.com/document/d/10QkXwiZfBL7wBKHHFslooXvGDKHA75jkkgiIXuKFryM/edit?usp=sharing)
77
* [Code organization Office Hours - Biweekly Thursday at 14:00 PT (Pacific Time)](https://docs.google.com/document/d/1HtTI0rJEGP_MSf6eO87aCmx_tzpovPAAg7U2Zxwm8FE/edit#)
8-
* Cluster Lifecycle -
8+
* Cluster Lifecycle -
99
* [Cluster API (AWS implementation) office hours - Biweekly Monday at 10:00 PT (Pacific Time)](https://docs.google.com/document/d/1ojR0jooQaHEuz3gGW6DxcZlsws9ZX7jHPC8walm1G3A/edit)
1010
* [Cluster API office hours - Biweekly Wednesday at 10:00 PT (Pacific Time)](https://docs.google.com/document/d/1fQNlqsDkvEggWFi51GVxOglL2P1Bvo2JhZlMhm2d-Co/edit)
1111
* [Image Builder office hours - Biweekly Wednesday at 11:00 PT (Pacific Time)](https://docs.google.com/document/d/1YIOD0Nnid_0h6rKlDxcbfJaoIRNO6mQd9Or5vKRNxaU/edit)
@@ -14,7 +14,7 @@ title: Office Hours/ Mentoring
1414
* [kops Office Hours - Biweekly Friday at 09:00 PT (Pacific Time)](https://docs.google.com/document/d/12QkyL0FkNbWPcLFxxRGSPt_tNPBHbmni3YLY-lHny7E/edit)
1515
* [kubeadm Office Hours - Biweekly Wednesday at 09:00 PT (Pacific Time)](https://docs.google.com/document/d/130_kiXjG7graFNSnIAgtMS1G8zPDwpkshgfRYS0nggo/edit)
1616
* [minikube Office Hours - Biweekly Monday at 11:00 PT (Pacific Time)](https://docs.google.com/document/d/1jhfmL1gsgN39uCEgz5pW9tnIotFgHhxq2yfMK3KYE4w/edit)
17-
* Network -
17+
* Network -
1818
* [Service APIs Office Hours - Biweekly Wednesday at 15:00 PT (Pacific Time)](https://docs.google.com/document/d/1eg-YjOHaQ7UD28htdNxBR3zufebozXKyI28cl2E11tU/edit)
1919
* Testing -
2020
* [SIG Testing Office Hours - Biweekly Tuesday at 10:00 PT (Pacific Time)](https://bit.ly/k8s-sig-testing-notes)

sig-api-machinery/README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Covers all aspects of API server, API registration and discovery, generic API CR
1313
The [charter](charter.md) defines the scope and governance of the API Machinery Special Interest Group.
1414

1515
## Meetings
16-
* Kubebuilder and Controller Runtime Meeting: [Wednesdays at 10:00 PT (Pacific Time)]() (monthly - second Wednesday every month). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=10:00&tz=PT%20%28Pacific%20Time%29).
16+
* Kubebuilder and Controller Runtime Meeting: [Thursdays at 09:00 PT (Pacific Time)]() (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=09:00&tz=PT%20%28Pacific%20Time%29).
1717
* [Meeting notes and Agenda](https://docs.google.com/document/d/1Ih-2cgg1bUrLwLVTB9tADlPcVdgnuMNBGbUl4D-0TIk/edit?usp=sharing).
1818
* Regular SIG Meeting: [Wednesdays at 11:00 PT (Pacific Time)](https://zoom.us/my/apimachinery) (biweekly). [Convert to your timezone](http://www.thetimezoneconverter.com/?t=11:00&tz=PT%20%28Pacific%20Time%29).
1919
* [Meeting notes and Agenda](https://goo.gl/0lbiM9).
@@ -111,6 +111,7 @@ The following [subprojects][subproject-definition] are owned by sig-api-machiner
111111
### server-sdk
112112
- **Owners:**
113113
- https://raw.githubusercontent.com/kubernetes-sigs/apiserver-builder-alpha/master/OWNERS
114+
- https://raw.githubusercontent.com/kubernetes-sigs/apiserver-runtime/master/OWNERS
114115
- https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/master/OWNERS
115116
- https://raw.githubusercontent.com/kubernetes-sigs/controller-tools/master/OWNERS
116117
- https://raw.githubusercontent.com/kubernetes-sigs/kubebuilder-declarative-pattern/master/OWNERS

0 commit comments

Comments
 (0)