Skip to content

Commit b70d408

Browse files
dargudear-googledargudear-google
authored
Merge branch 'main' into provider-gcp-test
2 parents 4da328b + 7575a0c commit b70d408

File tree

2,008 files changed

+70585
-893
lines changed

Some content is hidden

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

2,008 files changed

+70585
-893
lines changed

‎.atlantis.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
version: 3
2+
automerge: true
3+
autodiscover:
4+
mode: auto
5+
parallel_plan: true
6+
parallel_apply: true
7+
abort_on_execution_order_fail: true
8+
projects:
9+
- name: k8s-infra-ii-sandbox
10+
branch: /main/
11+
dir: infra/gcp/terraform/k8s-infra-ii-sandbox
12+
workspace: default
13+
terraform_version: v1.3.0

‎OWNERS_ALIASES

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ aliases:
5757
- dgrisonnet
5858
- logicalhan
5959
- rexagod
60+
- richabanker
6061
sig-k8s-infra-leads:
6162
- BenTheElder
6263
- ameukam
@@ -120,7 +121,7 @@ aliases:
120121
- knabben
121122
- marosset
122123
wg-batch-leads:
123-
- alculquicondor
124+
- kannon92
124125
- mwielgus
125126
- soltysh
126127
- swatisehgal

‎apps/OWNERS

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

33
approvers:
4-
- ameukam
5-
- dims
6-
- spiffxp
7-
- thockin
4+
- sig-k8s-infra-leads
85

96
labels:
107
- sig/k8s-infra

‎apps/elekto/OWNERS

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

33
approvers:
4-
- alisondy # Election Officer
5-
- ameukam # sig-k8s-infra Liaison
64
- jberkus # Election Officer
7-
- coderanger # Election Officer
85

96
labels:
10-
- sig/contributor-experience
7+
- sig/contributor-experience

‎apps/gcsweb/OWNERS

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

33
approvers:
4-
- spiffxp
5-
- thockin
4+
- sig-testing-leads
65

76
emeritus_approvers:
87
- ixdy
8+
- spiffxp
99

1010
labels:
1111
- sig/testing

‎apps/k8s-io/OWNERS

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

33
approvers:
4-
- aojea
5-
- bentheelder
6-
- cblecker
7-
- dims
8-
- nikhita
9-
- spiffxp
10-
- thockin
4+
- sig-contributor-experience-leads
5+
- sig-k8s-infra-leads
6+
- sig-testing-leads
117

128
emeritus_approvers:
139
- ixdy
10+
- spiffxp
11+
- thockin
1412

1513
labels:
1614
- sig/contributor-experience

‎apps/k8s-io/configmap-nginx.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ data:
291291
location / {
292292
rewrite ^/api-review$ https://github.com/kubernetes/community/blob/master/sig-architecture/api-review-process.md redirect;
293293
rewrite ^/bot-commands$ https://prow.k8s.io/command-help redirect;
294+
rewrite ^/bsky$ https://bsky.app/profile/did:plc:kfztyuziv2i44b5kpecth77y/lists/3lau2wjkn3g2s redirect;
294295
rewrite ^/calendar$ https://www.k8s.dev/calendar redirect;
295296
rewrite ^/github-labels$ https://github.com/kubernetes/test-infra/blob/master/label_sync/labels.md redirect;
296297
rewrite ^/good-first-issue$ https://github.com/issues?q=org%3Akubernetes+org%3Akubernetes-sigs+org%3Akubernetes-csi+org%3Akubernetes-client+is%3Aopen+is%3Aissue+label%3A%22good+first+issue%22+no%3Aassignee redirect;

‎apps/kettle/deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
serviceAccountName: kettle
1818
containers:
1919
- name: kettle
20-
image: gcr.io/k8s-staging-infra-tools/kettle:latest
20+
image: gcr.io/k8s-staging-test-infra/kettle:v20241015-f5fd905349
2121
imagePullPolicy: Always
2222
env:
2323
- name: DEPLOYMENT

‎apps/kubernetes-external-secrets/OWNERS

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
# See the OWNERS docs at https://go.k8s.io/owners
22

3-
approvers:
4-
- ameukam
5-
- spiffxp
6-
73
reviewers:
84
- sig-k8s-infra-leads
95

‎apps/slack-infra/OWNERS

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

33
approvers:
4-
- ameukam
5-
- cblecker
6-
- cpanato
7-
- dims
8-
- jeefy
9-
- mrbobbytables
10-
- nikhita
11-
- rajula96reddy
12-
- spiffxp
13-
- thockin
4+
- sig-contributor-experience-leads
145

156
labels:
167
- sig/contributor-experience

0 commit comments

Comments
 (0)