Skip to content

Commit 7b5f781

Browse files
authored
Merge pull request #34861 from upodroid/delete-unused-tolerations
remove the temporary node taints/selectors used to test the new nodepools
2 parents 21c4248 + 63a27f5 commit 7b5f781

File tree

7 files changed

+2
-115
lines changed

7 files changed

+2
-115
lines changed

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

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,7 @@ periodics:
4848
# this is mostly for building kubernetes
4949
memory: 9Gi
5050
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"
51+
5852
- interval: 1h
5953
cluster: k8s-infra-prow-build
6054
name: ci-kubernetes-kind-ipv6-e2e-parallel
@@ -111,10 +105,3 @@ periodics:
111105
memory: 9Gi
112106
# during the tests more like 3-20m is used
113107
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: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ presubmits:
4141
requests:
4242
cpu: 7
4343
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"
5144
annotations:
5245
testgrid-dashboards: sig-arch-code-organization
5346
testgrid-tab-name: pull-kind-master-dependencies
@@ -102,10 +95,3 @@ periodics:
10295
requests:
10396
cpu: 7
10497
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/integration.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,6 @@ presubmits:
7272
requests:
7373
cpu: 8
7474
memory: 20Gi
75-
tolerations:
76-
- key: "dedicated"
77-
operator: "Equal"
78-
value: "sig-testing"
79-
effect: "NoSchedule"
8075
- name: pull-kubernetes-integration-go-compatibility
8176
cluster: k8s-infra-prow-build
8277
always_run: true
@@ -145,11 +140,6 @@ presubmits:
145140
requests:
146141
cpu: 6
147142
memory: 15Gi
148-
tolerations:
149-
- key: "dedicated"
150-
operator: "Equal"
151-
value: "sig-testing"
152-
effect: "NoSchedule"
153143
periodics:
154144
- interval: 1h
155145
cluster: eks-prow-build-cluster

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

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,6 @@ presubmits:
3636
requests:
3737
cpu: 7
3838
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"
4639
annotations:
4740
testgrid-num-failures-to-alert: '10'
4841
testgrid-alert-stale-results-hours: '24'
@@ -89,14 +82,6 @@ presubmits:
8982
requests:
9083
cpu: 7
9184
memory: 9000Mi
92-
# use experimental new nodepool with C4 VM, cgroup v2
93-
nodeSelector:
94-
cloud.google.com/machine-family: c4
95-
tolerations:
96-
- key: "dedicated"
97-
operator: "Equal"
98-
value: "sig-testing"
99-
effect: "NoSchedule"
10085
annotations:
10186
testgrid-num-failures-to-alert: '10'
10287
testgrid-alert-stale-results-hours: '24'
@@ -145,14 +130,6 @@ presubmits:
145130
requests:
146131
cpu: 7
147132
memory: 9000Mi
148-
# use experimental new nodepool with C4 VM, cgroup v2
149-
nodeSelector:
150-
cloud.google.com/machine-family: c4
151-
tolerations:
152-
- key: "dedicated"
153-
operator: "Equal"
154-
value: "sig-testing"
155-
effect: "NoSchedule"
156133
annotations:
157134
fork-per-release: "true"
158135
testgrid-num-failures-to-alert: '10'
@@ -202,14 +179,6 @@ presubmits:
202179
requests:
203180
cpu: 7
204181
memory: 9000Mi
205-
# use experimental new nodepool with C4 VM, cgroup v2
206-
nodeSelector:
207-
cloud.google.com/machine-family: c4
208-
tolerations:
209-
- key: "dedicated"
210-
operator: "Equal"
211-
value: "sig-testing"
212-
effect: "NoSchedule"
213182
annotations:
214183
testgrid-num-failures-to-alert: '10'
215184
testgrid-alert-stale-results-hours: '24'
@@ -540,13 +509,6 @@ periodics:
540509
# this is mostly for building kubernetes
541510
memory: 9Gi
542511
cpu: 7
543-
nodeSelector:
544-
cloud.google.com/machine-family: c4
545-
tolerations:
546-
- key: "dedicated"
547-
operator: "Equal"
548-
value: "sig-testing"
549-
effect: "NoSchedule"
550512

551513
- interval: 4h
552514
cluster: k8s-infra-prow-build
@@ -596,13 +558,6 @@ periodics:
596558
# this is mostly for building kubernetes
597559
memory: 9Gi
598560
cpu: 7
599-
nodeSelector:
600-
cloud.google.com/machine-family: c4
601-
tolerations:
602-
- key: "dedicated"
603-
operator: "Equal"
604-
value: "sig-testing"
605-
effect: "NoSchedule"
606561

607562
- interval: 4h
608563
cluster: k8s-infra-prow-build
@@ -656,13 +611,7 @@ periodics:
656611
# this is mostly for building kubernetes
657612
memory: 9Gi
658613
cpu: 7
659-
nodeSelector:
660-
cloud.google.com/machine-family: c4
661-
tolerations:
662-
- key: "dedicated"
663-
operator: "Equal"
664-
value: "sig-testing"
665-
effect: "NoSchedule"
614+
666615
- interval: 24h
667616
cluster: k8s-infra-prow-build
668617
name: ci-kubernetes-e2e-kind-rootless

config/jobs/kubernetes/sig-testing/kubetest-canaries.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,6 @@ periodics:
2828
requests:
2929
cpu: 2
3030
memory: 4Gi
31-
tolerations:
32-
- key: "dedicated"
33-
operator: "Equal"
34-
value: "sig-testing"
35-
effect: "NoSchedule"
3631
annotations:
3732
testgrid-dashboards: sig-testing-canaries
3833
testgrid-tab-name: prow
@@ -78,11 +73,6 @@ periodics:
7873
requests:
7974
cpu: 2
8075
memory: 4Gi
81-
tolerations:
82-
- key: "dedicated"
83-
operator: "Equal"
84-
value: "sig-testing"
85-
effect: "NoSchedule"
8676
annotations:
8777
testgrid-dashboards: sig-testing-canaries
8878
testgrid-tab-name: node

config/jobs/kubernetes/test-infra/test-infra-canaries.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,6 @@ periodics:
2525
requests:
2626
cpu: 2
2727
memory: 4Gi
28-
tolerations:
29-
- key: "dedicated"
30-
operator: "Equal"
31-
value: "sig-testing"
32-
effect: "NoSchedule"
3328
annotations:
3429
testgrid-dashboards: sig-testing-canaries
3530
testgrid-tab-name: benchmark-demo
@@ -77,11 +72,6 @@ periodics:
7772
limits:
7873
memory: "256Mi"
7974
cpu: "500m"
80-
tolerations:
81-
- key: "dedicated"
82-
operator: "Equal"
83-
value: "sig-testing"
84-
effect: "NoSchedule"
8575
annotations:
8676
testgrid-dashboards: sig-testing-canaries
8777
testgrid-tab-name: multiple-container-test

config/jobs/kubernetes/test-infra/test-infra-periodics.yaml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ periodics:
2929
requests:
3030
cpu: 2
3131
memory: 4Gi
32-
tolerations:
33-
- key: "dedicated"
34-
operator: "Equal"
35-
value: "sig-testing"
36-
effect: "NoSchedule"
3732
annotations:
3833
testgrid-dashboards: sig-testing-misc
3934
testgrid-tab-name: continuous

0 commit comments

Comments
 (0)