Skip to content

Commit a0200a0

Browse files
ahg-gahg-g
authored
Merge branch 'kubernetes:main' into main
2 parents 2af20f5 + 4d08556 commit a0200a0

File tree

803 files changed

+19872
-994
lines changed

Some content is hidden

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

803 files changed

+19872
-994
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: 1 addition & 0 deletions
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

‎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/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

‎artifacts/manifests/k8s-staging-kops/1.30.2.yaml

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
files:
2+
- name: 1.30.2/darwin/amd64/kops
3+
sha256: 37eb7777d4364bf40f0ea60e16d16a725ba9e65178fdc950fcbb589a183862f3
4+
- name: 1.30.2/darwin/amd64/kops.sha256
5+
sha256: 8aef23512e1f1d0d2925f9060a1cd00d0067669db993efc3eeaff4796fed0920
6+
- name: 1.30.2/darwin/arm64/kops
7+
sha256: b909566f9b892a8a9515627ec9a78e64a1780f2e392feb06c4ec30827309b577
8+
- name: 1.30.2/darwin/arm64/kops.sha256
9+
sha256: c24e38bd31e30417d7378fa610d51d5ae0ef9ad6db801e5a1b20e1c25620cf63
10+
- name: 1.30.2/images/dns-controller-amd64.tar.gz
11+
sha256: 16c990063006a290d4d1f72885153bfab57bab1a6b8d3e310207ccc4c7c98025
12+
- name: 1.30.2/images/dns-controller-amd64.tar.gz.sha256
13+
sha256: 57b5573edf6fd17930e3cd0b298c648eecb866b742d5f55206ea798d46def30c
14+
- name: 1.30.2/images/dns-controller-arm64.tar.gz
15+
sha256: 93855652a2c5e9d7e2172bad88c2080edb2c5ebf023396e78642f92b97a5fd36
16+
- name: 1.30.2/images/dns-controller-arm64.tar.gz.sha256
17+
sha256: 0b758f03fdc0ddd60ad053d5645af062fd24c3dc6aacd8dc126b01b850eb1d06
18+
- name: 1.30.2/images/kops-controller-amd64.tar.gz
19+
sha256: ab540e4884d692bb455007847c3a4a46f3200a42dfc15b4984de6e686f7a4c9a
20+
- name: 1.30.2/images/kops-controller-amd64.tar.gz.sha256
21+
sha256: 26ed6e281cdd143f91d600355251a203723b314aef30f3c7cd33a368547dcfd5
22+
- name: 1.30.2/images/kops-controller-arm64.tar.gz
23+
sha256: daf04497f8020fc9ab260f2215000c31b11da7f4e7dc6d9f8cdd87d4c6b1422e
24+
- name: 1.30.2/images/kops-controller-arm64.tar.gz.sha256
25+
sha256: 4529e846dcc38b3728c687c94fc2339522f5b2ed5564e4091f68fef850bea3cf
26+
- name: 1.30.2/images/kops-utils-cp-amd64.tar.gz
27+
sha256: 0d73bf716a5fed6f6a5e837a88df4820c8e9370bc900006bdaaeefe42e2492de
28+
- name: 1.30.2/images/kops-utils-cp-amd64.tar.gz.sha256
29+
sha256: db6a0e28e4a4c34a09519c957b5a0fd266174ea910651284c17a3e7ed20c5f48
30+
- name: 1.30.2/images/kops-utils-cp-arm64.tar.gz
31+
sha256: e863f6cad792115b5a657485ffa70d03d78adfb30cf4879b26f0ef629f5d442d
32+
- name: 1.30.2/images/kops-utils-cp-arm64.tar.gz.sha256
33+
sha256: e6fe6fed7752153ce44cc4a61d0116ba8f994de0035f078aa85799ea36f8437b
34+
- name: 1.30.2/images/kube-apiserver-healthcheck-amd64.tar.gz
35+
sha256: 78153930fdadd4f596305645943e599c83f25055418cc786072e330604cb0b56
36+
- name: 1.30.2/images/kube-apiserver-healthcheck-amd64.tar.gz.sha256
37+
sha256: 7cbd9a001904ce495b42f71d0d45012b25caa23a57933fb744bcbd941b097af9
38+
- name: 1.30.2/images/kube-apiserver-healthcheck-arm64.tar.gz
39+
sha256: d738bc46653e7cb4646cab66e1d3d03c5fece47584afdeaaa91162c48919178b
40+
- name: 1.30.2/images/kube-apiserver-healthcheck-arm64.tar.gz.sha256
41+
sha256: ab8516a482ad7486b44038563fd77700e17b2c5e0ffa6290cf7b2c8d797a774e
42+
- name: 1.30.2/linux/amd64/channels
43+
sha256: cf457ae5f261b3fdc7890ae4a30222abffb04b7a5809a7cedec06ef84861464a
44+
- name: 1.30.2/linux/amd64/channels.sha256
45+
sha256: dbc733299e0435588b7ee701ea6e08e83a8302b21b056051dd9390de6d6f8c6a
46+
- name: 1.30.2/linux/amd64/kops
47+
sha256: 14050f7d6cb659a5bbba418d10deeb3866efce27b94940a361dff65f59925f2e
48+
- name: 1.30.2/linux/amd64/kops.sha256
49+
sha256: ec9b027f51d43242fc5f20788bf0e8e08efebb201fe8514d4dc894d21ebb2abe
50+
- name: 1.30.2/linux/amd64/nodeup
51+
sha256: 9ad3b2d350f5c4b5758607dcd91bc3163ada178dcd80fcf6157b07d2d22ca748
52+
- name: 1.30.2/linux/amd64/nodeup.sha256
53+
sha256: e403d0aac13bf035a26b16857e64fee212c3ea31ee8060ff981419e06e9caf94
54+
- name: 1.30.2/linux/amd64/protokube
55+
sha256: 31943f1f9a26f084e9ad357badca50a37b3ac42faeedcd1a2e332615832cc757
56+
- name: 1.30.2/linux/amd64/protokube.sha256
57+
sha256: cf59ff8578f3887684b68d9df969140032544e7be1741d11eb91b53edd969799
58+
- name: 1.30.2/linux/arm64/channels
59+
sha256: a9450bbb38108f6ca07b974d49f69df3e23767c9baf4b596b075de8de38e7c10
60+
- name: 1.30.2/linux/arm64/channels.sha256
61+
sha256: 0ff846735667b27bf140f4a66508d107df82dd1590de7f1953348d366917d100
62+
- name: 1.30.2/linux/arm64/kops
63+
sha256: cb9c0b35cc91cf35cf2fe04237ebffa82f6e7c952e66b9de33d5a2c78e3319bc
64+
- name: 1.30.2/linux/arm64/kops.sha256
65+
sha256: dcf9e283fad92f73b820ffe6c877946e830757da4b13cf3bc83a894f5f6b07b2
66+
- name: 1.30.2/linux/arm64/nodeup
67+
sha256: e1d53d8dfd832f6188b3817bf2ff1521122c37f136dd5019ec7db091790e889d
68+
- name: 1.30.2/linux/arm64/nodeup.sha256
69+
sha256: d0ee0551a72899056513cb3556fabc96093b4d438a18ae0b96b4eff18fd35e61
70+
- name: 1.30.2/linux/arm64/protokube
71+
sha256: d98e3cff8f7b0697716421deb8347279910fd87bd6e9493a51bb26e5c52d17f5
72+
- name: 1.30.2/linux/arm64/protokube.sha256
73+
sha256: 00f16b9a5d69cde5bc98d6c7f4d7f92c30eb0a51b55e21e7091538743c584aac
74+
- name: 1.30.2/windows/amd64/kops.exe
75+
sha256: 16fc7c7f60ee3c3cfa5be7c5311a83cd7da0282c47166623268db5901b4a587a
76+
- name: 1.30.2/windows/amd64/kops.exe.sha256
77+
sha256: 12fdb8fa5598e91e2eeeda5fff45711d1fd7cec6afc610d5d4cae6ba2ad0ca8b

0 commit comments

Comments
 (0)