@@ -262,10 +262,9 @@ presubmits:
262
262
# We need support for disabling tests which need a recent kubelet.
263
263
# If a test is labeled with `KubeletMinVersion:1.34`, then it cannot run
264
264
# when the deployed kubelet is 1.32. This is enforced by
265
- # generating `KubeletMinVersion: isSubsetOf { 1.33, 1.34 }`, i.e.
266
- # not including the actual kubelet version and anything older
267
- # in an allow list.
268
- kubelet_label_filter="&& KubeletMinVersion: isSubsetOf { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
265
+ # generating `! KubeletMinVersion: containsAny { 1.33, 1.34 }`, i.e.
266
+ # including all unsupportd kubelet versions in a deny list.
267
+ kubelet_label_filter=" && ! KubeletMinVersion: containsAny { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
269
268
270
269
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation }$kubelet_label_filter && !Alpha && !Flaky && !Slow" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &
271
270
GINKGO_E2E_PID=$!
@@ -370,10 +369,9 @@ presubmits:
370
369
# We need support for disabling tests which need a recent kubelet.
371
370
# If a test is labeled with `KubeletMinVersion:1.34`, then it cannot run
372
371
# when the deployed kubelet is 1.32. This is enforced by
373
- # generating `KubeletMinVersion: isSubsetOf { 1.33, 1.34 }`, i.e.
374
- # not including the actual kubelet version and anything older
375
- # in an allow list.
376
- kubelet_label_filter="&& KubeletMinVersion: isSubsetOf { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
372
+ # generating `! KubeletMinVersion: containsAny { 1.33, 1.34 }`, i.e.
373
+ # including all unsupportd kubelet versions in a deny list.
374
+ kubelet_label_filter=" && ! KubeletMinVersion: containsAny { $( for v in $(seq $((previous_minor + 1)) $((minor - 1))); do echo "1.$v, "; done)1.$minor }"
377
375
378
376
KUBECONFIG=${HOME}/.kube/config ${ginkgo} run --nodes=8 --timeout=24h --silence-skips --force-newlines --no-color --label-filter="DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation }$kubelet_label_filter && !Alpha && !Flaky && !Slow" ${e2e_test} -- -provider=local -report-dir="${ARTIFACTS}" -report-complete-ginkgo -report-complete-junit &
379
377
GINKGO_E2E_PID=$!
0 commit comments