Skip to content

Commit 010416f

Browse files
authored
Merge pull request #34851 from upodroid/migrate-critical-kind-jobs-to-c4
migrate critical kind jobs to the new nodepool
2 parents 54e53e3 + bf0f76f commit 010416f

File tree

3 files changed

+59
-11
lines changed

3 files changed

+59
-11
lines changed

config/jobs/kubernetes-sigs/kind/kind-release-blocking.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ periodics:
1212
fork-per-release-periodic-interval: 1h 2h 6h 24h
1313
labels:
1414
preset-dind-enabled: "true"
15-
preset-kind-volume-mounts: "true"
1615
decorate: true
1716
decoration_config:
1817
timeout: 60m
@@ -49,6 +48,13 @@ periodics:
4948
# this is mostly for building kubernetes
5049
memory: 9Gi
5150
cpu: 7
51+
nodeSelector:
52+
cloud.google.com/machine-family: c4
53+
tolerations:
54+
- key: "dedicated"
55+
operator: "Equal"
56+
value: "sig-testing"
57+
effect: "NoSchedule"
5258
- interval: 1h
5359
cluster: k8s-infra-prow-build
5460
name: ci-kubernetes-kind-ipv6-e2e-parallel
@@ -62,7 +68,6 @@ periodics:
6268
fork-per-release-periodic-interval: 1h 2h 6h 24h
6369
labels:
6470
preset-dind-enabled: "true"
65-
preset-kind-volume-mounts: "true"
6671
decorate: true
6772
decoration_config:
6873
timeout: 60m
@@ -106,3 +111,10 @@ periodics:
106111
memory: 9Gi
107112
# during the tests more like 3-20m is used
108113
cpu: 7
114+
nodeSelector:
115+
cloud.google.com/machine-family: c4
116+
tolerations:
117+
- key: "dedicated"
118+
operator: "Equal"
119+
value: "sig-testing"
120+
effect: "NoSchedule"

config/jobs/kubernetes/sig-arch/kubernetes-code-organization.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ presubmits:
99
- release-\d+\.\d+ # per-release settings
1010
labels:
1111
preset-dind-enabled: "true"
12-
preset-kind-volume-mounts: "true"
1312
decoration_config:
1413
timeout: 60m
1514
grace_period: 15m
@@ -42,6 +41,13 @@ presubmits:
4241
requests:
4342
cpu: 7
4443
memory: 9000Mi
44+
nodeSelector:
45+
cloud.google.com/machine-family: c4
46+
tolerations:
47+
- key: "dedicated"
48+
operator: "Equal"
49+
value: "sig-testing"
50+
effect: "NoSchedule"
4551
annotations:
4652
testgrid-dashboards: sig-arch-code-organization
4753
testgrid-tab-name: pull-kind-master-dependencies
@@ -61,7 +67,6 @@ periodics:
6167
testgrid-num-columns-recent: '6'
6268
labels:
6369
preset-dind-enabled: "true"
64-
preset-kind-volume-mounts: "true"
6570
decorate: true
6671
decoration_config:
6772
timeout: 60m
@@ -97,3 +102,10 @@ periodics:
97102
requests:
98103
cpu: 7
99104
memory: 9000Mi
105+
nodeSelector:
106+
cloud.google.com/machine-family: c4
107+
tolerations:
108+
- key: "dedicated"
109+
operator: "Equal"
110+
value: "sig-testing"
111+
effect: "NoSchedule"

config/jobs/kubernetes/sig-testing/kubernetes-kind.yaml

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ presubmits:
99
- release-\d+\.\d+ # per-release settings
1010
labels:
1111
preset-dind-enabled: "true"
12-
preset-kind-volume-mounts: "true"
1312
decoration_config:
1413
timeout: 60m
1514
grace_period: 15m
@@ -37,6 +36,13 @@ presubmits:
3736
requests:
3837
cpu: 7
3938
memory: 9000Mi
39+
nodeSelector:
40+
cloud.google.com/machine-family: c4
41+
tolerations:
42+
- key: "dedicated"
43+
operator: "Equal"
44+
value: "sig-testing"
45+
effect: "NoSchedule"
4046
annotations:
4147
testgrid-num-failures-to-alert: '10'
4248
testgrid-alert-stale-results-hours: '24'
@@ -85,7 +91,7 @@ presubmits:
8591
memory: 9000Mi
8692
# use experimental new nodepool with C4 VM, cgroup v2
8793
nodeSelector:
88-
cloud.google.com/gke-nodepool: "pool6-20250327232037500200000001"
94+
cloud.google.com/machine-family: c4
8995
tolerations:
9096
- key: "dedicated"
9197
operator: "Equal"
@@ -141,7 +147,7 @@ presubmits:
141147
memory: 9000Mi
142148
# use experimental new nodepool with C4 VM, cgroup v2
143149
nodeSelector:
144-
cloud.google.com/gke-nodepool: "pool6-20250327232037500200000001"
150+
cloud.google.com/machine-family: c4
145151
tolerations:
146152
- key: "dedicated"
147153
operator: "Equal"
@@ -198,7 +204,7 @@ presubmits:
198204
memory: 9000Mi
199205
# use experimental new nodepool with C4 VM, cgroup v2
200206
nodeSelector:
201-
cloud.google.com/gke-nodepool: "pool6-20250327232037500200000001"
207+
cloud.google.com/machine-family: c4
202208
tolerations:
203209
- key: "dedicated"
204210
operator: "Equal"
@@ -499,7 +505,6 @@ periodics:
499505
testgrid-num-columns-recent: '6'
500506
labels:
501507
preset-dind-enabled: "true"
502-
preset-kind-volume-mounts: "true"
503508
decorate: true
504509
decoration_config:
505510
timeout: 60m
@@ -541,6 +546,13 @@ periodics:
541546
# this is mostly for building kubernetes
542547
memory: 9Gi
543548
cpu: 7
549+
nodeSelector:
550+
cloud.google.com/machine-family: c4
551+
tolerations:
552+
- key: "dedicated"
553+
operator: "Equal"
554+
value: "sig-testing"
555+
effect: "NoSchedule"
544556

545557
- interval: 4h
546558
cluster: k8s-infra-prow-build
@@ -553,7 +565,6 @@ periodics:
553565
testgrid-num-columns-recent: '6'
554566
labels:
555567
preset-dind-enabled: "true"
556-
preset-kind-volume-mounts: "true"
557568
decorate: true
558569
decoration_config:
559570
timeout: 60m
@@ -591,6 +602,13 @@ periodics:
591602
# this is mostly for building kubernetes
592603
memory: 9Gi
593604
cpu: 7
605+
nodeSelector:
606+
cloud.google.com/machine-family: c4
607+
tolerations:
608+
- key: "dedicated"
609+
operator: "Equal"
610+
value: "sig-testing"
611+
effect: "NoSchedule"
594612

595613
- interval: 4h
596614
cluster: k8s-infra-prow-build
@@ -603,7 +621,6 @@ periodics:
603621
testgrid-num-columns-recent: '6'
604622
labels:
605623
preset-dind-enabled: "true"
606-
preset-kind-volume-mounts: "true"
607624
decorate: true
608625
decoration_config:
609626
timeout: 60m
@@ -645,6 +662,13 @@ periodics:
645662
# this is mostly for building kubernetes
646663
memory: 9Gi
647664
cpu: 7
665+
nodeSelector:
666+
cloud.google.com/machine-family: c4
667+
tolerations:
668+
- key: "dedicated"
669+
operator: "Equal"
670+
value: "sig-testing"
671+
effect: "NoSchedule"
648672
- interval: 24h
649673
cluster: k8s-infra-prow-build
650674
name: ci-kubernetes-e2e-kind-rootless

0 commit comments

Comments
 (0)