Skip to content

Commit c7e933d

Browse files
Merge branch 'kubernetes:master' into archive-meeting-notes
2 parents 9789009 + 17e7d9f commit c7e933d

File tree

52 files changed

+2286
-35
lines changed

Some content is hidden

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

52 files changed

+2286
-35
lines changed

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
* Antonio Ojea (**[@aojea](https://github.com/aojea)**), Google
26-
* Stephen Augustus (**[@justaugustus](https://github.com/justaugustus)**), Cisco
26+
* Stephen Augustus (**[@justaugustus](https://github.com/justaugustus)**), Bloomberg L.P.
2727
* Paco Xu 徐俊杰 (**[@pacoxu](https://github.com/pacoxu)**), DaoCloud
2828
* Patrick Ohly (**[@pohly](https://github.com/pohly)**), Intel
2929
* Sascha Grunert (**[@saschagrunert](https://github.com/saschagrunert)**), Red Hat

communication/slack-config/usergroups.yaml

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -240,20 +240,22 @@ usergroups:
240240
long_name: Cluster API Release Team
241241
description: Members of the Cluster API Release Team
242242
members:
243-
- adilGhaffarDev
243+
- AttyXY
244+
- blind3dd
244245
- cahillsf
245246
- chandankumar4
246-
- jayesh-srivastava
247-
- pravarag
248-
- rajankumary2k
249-
- SD-13
247+
- cprivitere
248+
- hackeramitkumar
249+
- mboersma
250+
- mbrow137
251+
- pratik-mahalle
252+
- ramessesii2
253+
- RansherSingh
250254
- serngawy
251-
- sivchari
255+
- shecodesmagic
256+
- sreeram-venkitesh
252257
- Sunnatillo
253-
- tasdikrahman
254-
- tormath1
255-
- varshasuryawanshi
256-
- vishalanarase
258+
- wendy-ha18
257259

258260
- name: kcp-devs
259261
long_name: kcp Development Team

communication/slack-config/users.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ users:
2121
aravindputrevu: U1G27SDU6
2222
asmacdo: UNVH7RY9J
2323
Atharva-Shinde: U028J67T478
24+
AttyXY: U07KSK513NW
2425
AvineshTripathi: U029U44P26B
2526
bai: U4XAULHL3
2627
Bart Farrell: U01DZM7PJDT
@@ -29,6 +30,7 @@ users:
2930
benoitf: UCQC3DNUA
3031
bentheelder: U1P7T516X
3132
bhumijgupta: U022JUBM3B4
33+
blind3dd: UC7GPBQB1
3234
briandealwis: UAZKM38JV
3335
bubblemelon: U7K9C643G
3436
byako: U03GZBD4J4C
@@ -53,6 +55,7 @@ users:
5355
cji: U5YSRC21J
5456
clubanderson: U0462LN24QJ
5557
cpanato: U8DFY4TTK
58+
cprivitere: UEXCRF7EK
5659
csams: U02B6A9GF55
5760
Dave Smith-Uchida: UDZDED8G2
5861
david-martin: ULMJ41U73
@@ -164,6 +167,8 @@ users:
164167
maysunfaisal: U01DEHK2YUB
165168
mbbroberg: U18JTHMDY
166169
mbianchidev: UU1JM5G5A
170+
mboersma: U5PL62ULA
171+
mbrow137: U07HN4TUNKS
167172
mcbenjemaa: UF111SQ4U
168173
meatballhat: U01QEKCBTBM
169174
mehabhalodiya: U024HPAQDC1
@@ -210,6 +215,7 @@ users:
210215
pnbrown: U011JJTQVGF
211216
pohly: U91901TMF
212217
prajyot-parab: U02MVRCN8CX
218+
pratik-mahalle: U06P66FAHPU
213219
pravarag: UFA5V59J5
214220
prietyc123: U01D4MBLM52
215221
Priyankasaggu11929: U012EE74CU8
@@ -219,7 +225,9 @@ users:
219225
r-lawton: U019CNHR2E6
220226
rajankumary2k: U011YM87GQK
221227
rajula96reddy: U7K9EK1HC
228+
ramessesii2: U0359S5LUDR
222229
ramrodo: UU74ZC2RX
230+
RansherSingh: U05MZREAE2Y
223231
rashmigottipati: U013T1DD3PW
224232
razashahid107: U05FB1L2YM8
225233
reylejano: U01GDNJL5MW
@@ -248,6 +256,7 @@ users:
248256
sethmccombs: U92LLUZ8A
249257
sgtcodfish: U01PQ8N3PM1
250258
shamus: US7EUUBK8
259+
shecodesmagic: U0592U4JQA3
251260
shipra101: U06MJ9TT031
252261
shubham-pampattiwar: U01QW84HBBN
253262
simplytunde: UAY1NBYHE
@@ -292,6 +301,7 @@ users:
292301
Vyom-Yadav: U03658QBE1K
293302
vzhukovs: U030TR1FG85
294303
wallrj: U1ZMERJF7
304+
wendy-ha18: U072Q1ZPVA7
295305
willie-yao: U024EME7SQK
296306
wilsonehusin: U0100068GF2
297307
wurbanski: URX7CMK97

community-membership.md

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,13 @@ against the kubernetes/org repo, as above.
102102
- Members can do `/lgtm` on open PRs.
103103
- They can be assigned to issues and PRs, and people can ask members for reviews with a `/cc @username`.
104104
- Tests can be run against their PRs automatically. No `/ok-to-test` needed.
105-
- Members can do `/ok-to-test` for PRs that have a `needs-ok-to-test` label, and use commands like `/close` to close PRs as well.
105+
- Members can do `/ok-to-test` for PRs that have a `needs-ok-to-test` label, and use commands like `/close` to close issues or PRs as well.
106106

107-
**Note:** members who frequently contribute code are expected to proactively
107+
**Note:** Members who frequently contribute code are expected to proactively
108108
perform code reviews and work towards becoming a primary *reviewer* for the
109-
subproject that they are active in.
109+
subproject that they are active in. Members who contribute to the Kubernetes documentation
110+
can participate in the [pull request wrangler program](https://kubernetes.io/docs/contribute/participate/pr-wranglers/)
111+
to cultivate a habit of [reviewing for approvers and reviewers](https://kubernetes.io/docs/contribute/review/for-approvers/).
110112

111113
## Reviewer
112114

@@ -127,7 +129,7 @@ addition to the assigned reviewers.
127129
The following apply to the part of codebase for which one would be a reviewer in
128130
an [OWNERS] file (for repos using the bot).
129131

130-
- member for at least 3 months
132+
- Member for at least 3 months
131133
- Primary reviewer for at least 5 PRs to the codebase
132134
- Reviewed or merged at least 20 substantial PRs to the codebase
133135
- Knowledgeable about the codebase

contributors/devel/sig-node/e2e-node-tests.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@ Image configuration files can further influence how FOCUS and SKIP match test ca
188188
For example:
189189
190190
```sh
191-
--focus="\[NodeFeature:.+\]" --skip="\[Flaky\]|\[Serial\]"
191+
--focus="\[Feature:.+\]" --skip="\[Flaky\]|\[Serial\]"
192192
```
193193
194-
runs all e2e tests labeled `"[NodeFeature:*]"` and will skip any tests labeled `"[Flaky]"` or `"[Serial]"`.
194+
runs all e2e tests labeled `"[Feature:*]"` and will skip any tests labeled `"[Flaky]"` or `"[Serial]"`.
195195
196196
Two example e2e tests that match this expression are:
197197
* https://github.com/kubernetes/kubernetes/blob/0e2220b4462130ae8a22ed657e8979f7844e22c1/test/e2e_node/security_context_test.go#L155
@@ -235,15 +235,15 @@ To run a particular e2e test, simply pass the Grinkgo `It` string to the `--focu
235235
For example, suppose we have the following test case: https://github.com/kubernetes/kubernetes/blob/0e2220b4462130ae8a22ed657e8979f7844e22c1/test/e2e_node/security_context_test.go#L175. We could select this test case by adding the argument:
236236
237237
```sh
238-
--focus="should not show its pid in the non-hostpid containers \[NodeFeature:HostAccess\]"
238+
--focus="should not show its pid in the non-hostpid containers \[Feature:HostAccess\]"
239239
```
240240
241241
## Run all tests related to a feature
242242
243243
In contrast, to run all node e2e tests related to the "HostAccess" feature one could run:
244244
245245
```sh
246-
--focus="\[NodeFeature:HostAccess\]"
246+
--focus="\[Feature:HostAccess\]"
247247
```
248248
249249
## Run tests continually until they fail

elections/steering/2025-GB/OWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
approvers:
2+
- jberkus
3+
- soltysh
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-------------------------------------------------------------
2+
name: Christoph Blecker
3+
ID: cblecker
4+
-------------------------------------------------------------
5+
6+
# Christoph Blecker
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-------------------------------------------------------------
2+
name: Carlos Tadeu Panato Jr
3+
ID: cpanato
4+
-------------------------------------------------------------
5+
6+
# Carlos Tadeu Panato Jr
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-------------------------------------------------------------
2+
name: Davanum Srinivas
3+
ID: dims
4+
-------------------------------------------------------------
5+
6+
# Davanum Srinivas
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
-------------------------------------------------------------
2+
name: Nikhita Raghunath
3+
ID: nikhita
4+
-------------------------------------------------------------
5+
6+
# Nikhita Raghunath

0 commit comments

Comments
 (0)