Skip to content

Commit 83053c0

Browse files
GanirediGaniredi
authored
Merge branch 'main' into promote-v1.34.0-files
2 parents 8be6a8b + 24bc594 commit 83053c0

File tree

83 files changed

+1312
-185
lines changed

Some content is hidden

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

83 files changed

+1312
-185
lines changed

‎OWNERS_ALIASES‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,12 @@ aliases:
204204
- pohly
205205
- saschagrunert
206206
- soltysh
207-
## BEGIN CUSTOM CONTENT
207+
## BEGIN CUSTOM CONTENT
208+
minikube-approvers:
209+
- medyagh
210+
- spowelljr
211+
- prezha
212+
- comradeprogrammer
208213
promo-tools-approvers:
209214
- cpanato
210215
- jeremyrickard

‎apps/elekto/configmap.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ metadata:
66
data:
77
APP_NAME: "k8s.elections"
88
APP_ENV: production
9-
APP_KEY: ""
109
APP_DEBUG: "False"
1110
APP_URL: "http://localhost"
1211
APP_PORT: "8080"

‎apps/elekto/externalsecrets.yaml‎

Lines changed: 28 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
apiVersion: kubernetes-client.io/v1
22
kind: ExternalSecret
33
metadata:
4-
name: elekto-secret # The name of the Kubernetes Secret
4+
name: elekto-secret # The name of the Kubernetes Secret
55
namespace: elekto
66
labels:
77
app: elekto
88
spec:
99
backendType: gcpSecretsManager
1010
projectId: kubernetes-public
1111
data:
12-
- key: elekto-db-database
13-
name: DB_DATABASE
14-
version: latest
15-
- key: elekto-db-host
16-
name: DB_HOST
17-
version: latest
18-
- key: elekto-db-password
19-
name: DB_PASSWORD
20-
version: latest
21-
- key: elekto-db-port
22-
name: DB_PORT
23-
version: latest
24-
- key: elekto-db-username
25-
name: DB_USERNAME
26-
version: latest
27-
- key: elekto-github-client-id # The name of the GSM secret
28-
name: GITHUB_CLIENT_ID # The key to write to in the Kubernetes Secret
29-
version: latest # The version of the GSM secret
30-
- key: elekto-github-client-secret
31-
name: GITHUB_CLIENT_SECRET
32-
version: latest
33-
- key: elekto-meta-secret
34-
name: META_SECRET
35-
version: latest
12+
- key: elekto-db-database
13+
name: DB_DATABASE
14+
version: latest
15+
- key: elekto-db-host
16+
name: DB_HOST
17+
version: latest
18+
- key: elekto-db-password
19+
name: DB_PASSWORD
20+
version: latest
21+
- key: elekto-db-port
22+
name: DB_PORT
23+
version: latest
24+
- key: elekto-db-username
25+
name: DB_USERNAME
26+
version: latest
27+
- key: elekto-github-client-id # The name of the GSM secret
28+
name: GITHUB_CLIENT_ID # The key to write to in the Kubernetes Secret
29+
version: latest # The version of the GSM secret
30+
- key: elekto-github-client-secret
31+
name: GITHUB_CLIENT_SECRET
32+
version: latest
33+
- key: elekto-meta-secret
34+
name: META_SECRET
35+
version: latest
36+
- key: elekto-app-key
37+
name: APP_KEY
38+
version: latest

‎artifacts/manifests/k8s-staging-kops/1.32.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.32.2/darwin/amd64/kops
3+
sha256: b50d6434882d2fc5b4de6c11301215dbc91cebf6fc9ab5987ed362c572c284f4
4+
- name: 1.32.2/darwin/amd64/kops.sha256
5+
sha256: 3b6ac8520939bdb84240a965fbab326a5b023c8c05af7aeab9afd9b453dc9238
6+
- name: 1.32.2/darwin/arm64/kops
7+
sha256: 6843048868cc18a56b7c9ca79543afac9e501f4acd8e7977a4cd094f58751043
8+
- name: 1.32.2/darwin/arm64/kops.sha256
9+
sha256: d0f0dd43546f6bede0d156d05f94d248c1dace75e31f6b07473ca0ffefc9f7b3
10+
- name: 1.32.2/images/dns-controller-amd64.tar.gz
11+
sha256: 29607b8e4d6c18d22a6909edaeaa93645bdf2e4b862f332480173e689372b75c
12+
- name: 1.32.2/images/dns-controller-amd64.tar.gz.sha256
13+
sha256: 39c128e512573d334f1e1f9cbae166f4d28e0b0e4d51cf210c62f3eed9c26c45
14+
- name: 1.32.2/images/dns-controller-arm64.tar.gz
15+
sha256: 6b47fb4505928e528d44680f4fe8198f55919f02b2c3927fe341187c165f0f3a
16+
- name: 1.32.2/images/dns-controller-arm64.tar.gz.sha256
17+
sha256: ef6bd78f9a7d4e2068cf0ea854707844c064056bd8bd14010f72b2b7b76440af
18+
- name: 1.32.2/images/kops-controller-amd64.tar.gz
19+
sha256: c3a844ab3b416aa22190e9a01d705a9a24ed1332d438b1fba6205c336ee373c2
20+
- name: 1.32.2/images/kops-controller-amd64.tar.gz.sha256
21+
sha256: 15c9c51abfb59fd18096425afd71ddf78ac846aacbcac651c6fe45559ff763fc
22+
- name: 1.32.2/images/kops-controller-arm64.tar.gz
23+
sha256: 6610d990179ae4583c7543e48c527ec68fc37a4a06f0a20268d4893dbab17742
24+
- name: 1.32.2/images/kops-controller-arm64.tar.gz.sha256
25+
sha256: 5d8869ac5a95ea8a37ef17e0aec1226b69ad439fe6138243cbcc6b78df3d54e4
26+
- name: 1.32.2/images/kops-utils-cp-amd64.tar.gz
27+
sha256: ed9dd09d1dce01badd22f8c7cccee800a6f164f62f160272e3c87cc42b2de4b9
28+
- name: 1.32.2/images/kops-utils-cp-amd64.tar.gz.sha256
29+
sha256: a91e3271397e6f6001553a165a9f6630cd06975a64744dd33a1a2a98d2457434
30+
- name: 1.32.2/images/kops-utils-cp-arm64.tar.gz
31+
sha256: c38a171e025b4a0452c7f604f957074bbfd167693591aa0d0143b6573e90b838
32+
- name: 1.32.2/images/kops-utils-cp-arm64.tar.gz.sha256
33+
sha256: 15f3a5d3693d534941cc7b4ec4570699b155b03fd3da83e3ed4603c682cc9630
34+
- name: 1.32.2/images/kube-apiserver-healthcheck-amd64.tar.gz
35+
sha256: 3428e96d5dfd62c39ee0e7296654bda3f00999bf5cad706c813ecbce3a19ec7d
36+
- name: 1.32.2/images/kube-apiserver-healthcheck-amd64.tar.gz.sha256
37+
sha256: 0db6b2d6353f0b1e0405573383b7ae9cd073ca46b4baa7a8514c6966b3a909ab
38+
- name: 1.32.2/images/kube-apiserver-healthcheck-arm64.tar.gz
39+
sha256: b90da606812cfb8b421d01c5b346b7f8ad06191a4d8523e5e21c50478f2a1717
40+
- name: 1.32.2/images/kube-apiserver-healthcheck-arm64.tar.gz.sha256
41+
sha256: e08d5f05df09b57dd40b4f37e2251034511106badc613312f39fa50a815a555d
42+
- name: 1.32.2/linux/amd64/channels
43+
sha256: 140362f5ad90f9658099722efd472206c50481308fddc1adb94d9317a051c502
44+
- name: 1.32.2/linux/amd64/channels.sha256
45+
sha256: 7f60d8fdee7058edc4f7260571ca183c27c3c3433fb44660ba8b28ee303a73d1
46+
- name: 1.32.2/linux/amd64/kops
47+
sha256: a987d2e880a07f5210a6891f5915ad5de94d1c9397e60eac2b97f68400142a35
48+
- name: 1.32.2/linux/amd64/kops.sha256
49+
sha256: 209a4ac5769298e7e7ec679bf22f63f8e3db8eef11e12148739d0c7df757ecb6
50+
- name: 1.32.2/linux/amd64/nodeup
51+
sha256: b8a11704908b8a28c7bb33247eeb7bd1b32c2a4764e57d195a16918749ac6c71
52+
- name: 1.32.2/linux/amd64/nodeup.sha256
53+
sha256: 320175b5b2a2a69221893a9e7e24652651d16c2c13483d00568d896c8d4ccc5d
54+
- name: 1.32.2/linux/amd64/protokube
55+
sha256: 03491e9fc73739c3145b8b36c6c6d03b5a5fd642dab33ee0d10f033ef3929d50
56+
- name: 1.32.2/linux/amd64/protokube.sha256
57+
sha256: f2f9e42eb7bb0500d1ed73e4d66721ee4f04391352df2da1792a771c7c53fb34
58+
- name: 1.32.2/linux/arm64/channels
59+
sha256: e959400403b2d4e85874ce05635ab1b97a2a05c63569f5373aba75badfe08809
60+
- name: 1.32.2/linux/arm64/channels.sha256
61+
sha256: d7070a9c1c6fc6b44f9dfdc4124f305a5f630cdf5c479e0c04d0e535a69ce29f
62+
- name: 1.32.2/linux/arm64/kops
63+
sha256: 7c2e1ed4bb87880a127178d16fc2dd70f83cbd7bcbbcbcfbecd87492d792e158
64+
- name: 1.32.2/linux/arm64/kops.sha256
65+
sha256: 26743930b2eaf5cf52a3e3c988a583bf792e3a98ba44977efdaca14c596ae2c9
66+
- name: 1.32.2/linux/arm64/nodeup
67+
sha256: 56d3b9443433b4b7068da6ad532e18ef777d62cb050efe581f21fb2a6243606b
68+
- name: 1.32.2/linux/arm64/nodeup.sha256
69+
sha256: 35fe2a2c12b15251a02a2ff02d935bd4725ac818e428a168b451c7a09aca2303
70+
- name: 1.32.2/linux/arm64/protokube
71+
sha256: e197c9e6b9499ec81ddc4904220cb57ec3f346cfa95a91e4380274fdd7df8ab6
72+
- name: 1.32.2/linux/arm64/protokube.sha256
73+
sha256: 12eae6d4e145366ad40ba6c0d6925b1ebe8321e79504375d7df2621afd62309d
74+
- name: 1.32.2/windows/amd64/kops.exe
75+
sha256: 1fae106c9a0271c1474c25ddc26b92a98c69bff9c78523bf2b0b399689d0982e
76+
- name: 1.32.2/windows/amd64/kops.exe.sha256
77+
sha256: 923323ada6a9334b64ae9942fe7734b5e1de04e391043c68648b047db97ecca3

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

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
files:
2+
- name: 1.33.1/darwin/amd64/kops
3+
sha256: 9b3f99baa5c3978cb2d50d20b1c4ad0836ce31ca9f10db18f952d2b7b1fb6e96
4+
- name: 1.33.1/darwin/amd64/kops.sha256
5+
sha256: 44178eb204cbb20c909bc92674f397f1829ea56cb5074deccb4f20c5ecde80fe
6+
- name: 1.33.1/darwin/arm64/kops
7+
sha256: 5e4f815f489dbaf59178dd5b99b98ca524a12adb1f81f9d0ea012e51d3e50daa
8+
- name: 1.33.1/darwin/arm64/kops.sha256
9+
sha256: e8ec20a786d7c049d6372597d9914503e4a18073fb7b388922f3b06b17c5799d
10+
- name: 1.33.1/images/dns-controller-amd64.tar.gz
11+
sha256: 75461e98c874ede1cae38f58a02b2781130a06d94e1a746699c81445ea428b0b
12+
- name: 1.33.1/images/dns-controller-amd64.tar.gz.sha256
13+
sha256: 907be06a0694b1c96814a63ce491b16b996212a2cd73ab0bbae4df80126444e9
14+
- name: 1.33.1/images/dns-controller-arm64.tar.gz
15+
sha256: 3de7c24ab029dfae32f0e0fca0ab881dfb4bc45a0e1d14f63fd84acf6856f1a3
16+
- name: 1.33.1/images/dns-controller-arm64.tar.gz.sha256
17+
sha256: 01bee4cad4762023bcb6b4bc8f01c1fdc056428d2723e0cdc2ae58f97f14e69b
18+
- name: 1.33.1/images/kops-controller-amd64.tar.gz
19+
sha256: c3767f179370eb53bee02cec868a2d4aeac0e81745e98447501525b37346fd93
20+
- name: 1.33.1/images/kops-controller-amd64.tar.gz.sha256
21+
sha256: b4603da800796689f027ef85473e5419412b329418371bee2d9d7301cb572969
22+
- name: 1.33.1/images/kops-controller-arm64.tar.gz
23+
sha256: b5edf70938a70bd2433eb8b80ae6a75fa2f506af44fe261ee71e842d3c874e97
24+
- name: 1.33.1/images/kops-controller-arm64.tar.gz.sha256
25+
sha256: 7c2420cc90504e8f5134cf9ff154ed8a3b9facac331dd35dc38f441acae55093
26+
- name: 1.33.1/images/kops-utils-cp-amd64.tar.gz
27+
sha256: a32a249cf5fb4cf6fc68643edf6f509c81e1a71acce3955e0f2952d7d8515513
28+
- name: 1.33.1/images/kops-utils-cp-amd64.tar.gz.sha256
29+
sha256: f97f0aaa59f996ad486ea32309bb7f693a11f7c9c3a61c0167bdeee02023d6f7
30+
- name: 1.33.1/images/kops-utils-cp-arm64.tar.gz
31+
sha256: 0248c495c405769e2d6968159eaca33e2ade24dd9b0fe3b81daacd16522e5abd
32+
- name: 1.33.1/images/kops-utils-cp-arm64.tar.gz.sha256
33+
sha256: a069debe3b3cf803dd82f239f72e45d97c2a20dc4467edce965e4c2ed6352c54
34+
- name: 1.33.1/images/kube-apiserver-healthcheck-amd64.tar.gz
35+
sha256: 9c0aefe919efddf99f4e7cf5f35dd150e33d06c0a3249b45f3d468753bf5630f
36+
- name: 1.33.1/images/kube-apiserver-healthcheck-amd64.tar.gz.sha256
37+
sha256: 6ccfb3f226f3853c4b072fd18ef67a3ae541ef099a734165abf3bda9163c3d57
38+
- name: 1.33.1/images/kube-apiserver-healthcheck-arm64.tar.gz
39+
sha256: 4b87f9bf8cf71a5c56f2472eecc12783962053b70de881fa9deb444d60657275
40+
- name: 1.33.1/images/kube-apiserver-healthcheck-arm64.tar.gz.sha256
41+
sha256: 2c6be8933856df79fac9e76e59f0567af11580b2b9e3451b76e8a706a70aa0f2
42+
- name: 1.33.1/linux/amd64/channels
43+
sha256: 1ca3309a2d65ecf6e6f8c0f73a3b2059df8c3c1988f31dd7f23e9670dff7199a
44+
- name: 1.33.1/linux/amd64/channels.sha256
45+
sha256: e2756f9503f3829431929165815125aef7acb025db5da393162edf9310601a83
46+
- name: 1.33.1/linux/amd64/kops
47+
sha256: 13c239593373f22b11b587a0ed9b3eb2ad46f07819e89d3dff6bb0695ba810b3
48+
- name: 1.33.1/linux/amd64/kops.sha256
49+
sha256: 64d6c46362622827cee12730f862a683d731c3956c345612cd166796afe7e291
50+
- name: 1.33.1/linux/amd64/nodeup
51+
sha256: 6510d0a2b315c1e83f84d331f03e7ba8a57ef76119d53336ceed5871eca8c511
52+
- name: 1.33.1/linux/amd64/nodeup.sha256
53+
sha256: 0d9d48c12b3ced45897fada30cb9ff7c8b2032da2027b8cc31efe8374fca5aa0
54+
- name: 1.33.1/linux/amd64/protokube
55+
sha256: 047e28c6bab95cd62206f5f0fff3b65ced884829bbbeb6df815fba69bae3e131
56+
- name: 1.33.1/linux/amd64/protokube.sha256
57+
sha256: fb32c586bd3038947dd91dcf299ed93eac02bfc05386c324cb3a59f4f4ab4278
58+
- name: 1.33.1/linux/arm64/channels
59+
sha256: 0f1efe78ebb27541dcd4bdac85be25ef3cc66c38d214a74a7c6b943e8c6739e5
60+
- name: 1.33.1/linux/arm64/channels.sha256
61+
sha256: a69ce64ea4cebe775badfec564559424cc5d184560250228705e21f2440abd25
62+
- name: 1.33.1/linux/arm64/kops
63+
sha256: 9b0e1a28f9d8e4d947a5b273e8f92d0b1940651e8ae8b853a02ed876bd6dd000
64+
- name: 1.33.1/linux/arm64/kops.sha256
65+
sha256: d0caea5251f8687a733afe0a8c0d3a039484900026dd6e333605e340931fe807
66+
- name: 1.33.1/linux/arm64/nodeup
67+
sha256: 8b79985f35f8c74182a94c22a089d9a4d0aba780ec63b58dd18e9a19682d5154
68+
- name: 1.33.1/linux/arm64/nodeup.sha256
69+
sha256: de897da0cb2bd31ffab8b54c16a19e579cdb61143fb0631731a66801b0886c08
70+
- name: 1.33.1/linux/arm64/protokube
71+
sha256: b24464578f3680ef742627187fe175e302f4dbdd18ed9f13d176c308ed5eef7b
72+
- name: 1.33.1/linux/arm64/protokube.sha256
73+
sha256: 8e801b5df46fb618893322d4b47d162c8b4cdcd1924a9c0031f1247db05d7c56
74+
- name: 1.33.1/windows/amd64/kops.exe
75+
sha256: a34276afb8f546c3fe49b4f4a70e223776b1d3d7571f73471bacff558fabf708
76+
- name: 1.33.1/windows/amd64/kops.exe.sha256
77+
sha256: 0414c1c41ce9b5c871e7a602bd7ce16e0cf12c5f31fbb3ad49b64e6a6982d115

‎dns/zone-configs/k8s.io._0_base.yaml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,7 @@ docs.prow:
387387
# https://github.com/kubernetes-sigs/cluster-api docs (@dwat, @jdetiber, @justinsb)
388388
cluster-api.sigs:
389389
type: CNAME
390-
value: release-1-10--kubernetes-sigs-cluster-api.netlify.app.
390+
value: release-1-11--kubernetes-sigs-cluster-api.netlify.app.
391391
# https://github.com/kubernetes-sigs/cluster-api-provider-aws docs (@randomvariable, @detiber, @ncdc, @rudoi, @vincepri)
392392
cluster-api-aws.sigs:
393393
type: CNAME
@@ -467,6 +467,9 @@ release-1-9.cluster-api.sigs:
467467
release-1-10.cluster-api.sigs:
468468
type: CNAME
469469
value: release-1-10--kubernetes-sigs-cluster-api.netlify.app.
470+
release-1-11.cluster-api.sigs:
471+
type: CNAME
472+
value: release-1-11--kubernetes-sigs-cluster-api.netlify.app.
470473
# https://github.com/kubernetes-sigs/cluster-api development docs (@CecileRobertMichon, @vincepri)
471474
main.cluster-api.sigs:
472475
type: CNAME

‎groups/committee-security-response/groups.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ groups:
6565
- [email protected]
6666
- [email protected]
6767
- [email protected]
68+
- [email protected]
6869

6970
- email-id: [email protected]
7071
name: security

‎groups/committee-steering/groups.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,5 +98,5 @@ groups:
9898
ReconcileMembers: "true"
9999
owners:
100100
- [email protected]
101-
- [email protected]
102-
- priyankasaggu11929@gmail.com
101+
- [email protected]
102+
- ninapolshakova@gmail.com

‎groups/restrictions.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ restrictions:
8989
- "^[email protected]$"
9090
- "^[email protected]$"
9191
- "^[email protected]$"
92+
- "^[email protected]$"
9293
- "^[email protected]$"
9394
- "^[email protected]$"
9495
- "^[email protected]$"

‎groups/sig-cluster-lifecycle/groups.yaml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
groups:
2-
32
#
43
# Mailing lists
54
#
@@ -89,6 +88,16 @@ groups:
8988
- [email protected]
9089
- [email protected]
9190

91+
- email-id: [email protected]
92+
name: k8s-infra-staging-minikube
93+
description: |-
94+
ACL for staging Minikube
95+
settings:
96+
ReconcileMembers: "true"
97+
members:
98+
- [email protected]
99+
- [email protected]
100+
92101
- email-id: [email protected]
93102
name: k8s-infra-staging-capi-operator
94103
description: |-
@@ -358,7 +367,6 @@ groups:
358367
- [email protected]
359368
- [email protected]
360369

361-
362370
- email-id: [email protected]
363371
name: sig-cluster-lifecycle-cluster-api-gcp-alerts
364372
description: |-
@@ -512,7 +520,6 @@ groups:
512520
# required for membership in these groups.
513521
#
514522

515-
516523
# RBAC groups:
517524
# - grant access to the `namespace-user` role for a single namespace on the `aaa` cluster
518525
# - must have WhoCanViewMemberShip: "ALL_MEMBERS_CAN_VIEW"

0 commit comments

Comments
 (0)