Skip to content

Commit 9dc89bf

Browse files
committed
DRA E2E node: fix test selection
The node jobs incorrectly used OffByDefault, without actually enabling all off-by-default feature gates. This caused ResourceHealthStatus test to run and fail until that feature gate was explicitly excluded. We don't want to repeat that for every new alpha feature; updating the allow list (= isSubsetOf) is the right approach. Adding a job which includes alpha and beta features follows in a separate commit.
1 parent 196b871 commit 9dc89bf

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

config/jobs/kubernetes/sig-node/dra-canary.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ presubmits:
704704
preset-k8s-ssh: "true"
705705
annotations:
706706
testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits, sig-node-cri-o
707-
description: Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v1
707+
description: Runs E2E node tests for Dynamic Resource Allocation on-by-default features with CRI-O using cgroup v1
708708
testgrid-alert-email: [email protected], [email protected]
709709
decorate: true
710710
decoration_config:
@@ -728,10 +728,10 @@ presubmits:
728728
- --repo-root=.
729729
- --gcp-zone=us-central1-b
730730
- --parallelism=1
731-
- '--label-filter=DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } && !FeatureGate:ResourceHealthStatus && !Flaky && !Slow'
731+
- '--label-filter=DRA && Feature: isSubsetOf { DynamicResourceAllocation } && !Flaky && !Slow'
732732
- --timeout=60m
733733
- --skip-regex= # Override kubetest2 default in https://github.com/kubernetes-sigs/kubetest2/blob/9f385d26316f5256755bb8fe333970aa5759ec7f/pkg/testers/node/node.go#L92
734-
- '--test-args=--feature-gates="DynamicResourceAllocation=true" --service-feature-gates="DynamicResourceAllocation=true" --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
734+
- '--test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
735735
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv1.yaml
736736
env:
737737
- name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
@@ -760,7 +760,7 @@ presubmits:
760760
preset-k8s-ssh: "true"
761761
annotations:
762762
testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits, sig-node-cri-o
763-
description: Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v2
763+
description: Runs E2E node tests for Dynamic Resource Allocation on-by-default features with CRI-O using cgroup v2
764764
testgrid-alert-email: [email protected], [email protected]
765765
decorate: true
766766
decoration_config:
@@ -784,10 +784,10 @@ presubmits:
784784
- --repo-root=.
785785
- --gcp-zone=us-central1-b
786786
- --parallelism=1
787-
- '--label-filter=DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } && !FeatureGate:ResourceHealthStatus && !Flaky && !Slow'
787+
- '--label-filter=DRA && Feature: isSubsetOf { DynamicResourceAllocation } && !Flaky && !Slow'
788788
- --timeout=60m
789789
- --skip-regex= # Override kubetest2 default in https://github.com/kubernetes-sigs/kubetest2/blob/9f385d26316f5256755bb8fe333970aa5759ec7f/pkg/testers/node/node.go#L92
790-
- '--test-args=--feature-gates="DynamicResourceAllocation=true" --service-feature-gates="DynamicResourceAllocation=true" --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
790+
- '--test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
791791
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv2.yaml
792792
env:
793793
- name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
@@ -816,7 +816,7 @@ presubmits:
816816
preset-k8s-ssh: "true"
817817
annotations:
818818
testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits, sig-node-containerd
819-
description: Runs E2E node tests for Dynamic Resource Allocation beta features with containerd 1.7
819+
description: Runs E2E node tests for Dynamic Resource Allocation on-by-default features with containerd 1.7
820820
testgrid-alert-email: [email protected], [email protected]
821821
decorate: true
822822
decoration_config:
@@ -840,10 +840,10 @@ presubmits:
840840
- --repo-root=.
841841
- --gcp-zone=us-central1-b
842842
- --parallelism=1
843-
- '--label-filter=DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } && !FeatureGate:ResourceHealthStatus && !Flaky && !Slow'
843+
- '--label-filter=DRA && Feature: isSubsetOf { DynamicResourceAllocation } && !Flaky && !Slow'
844844
- --timeout=60m
845845
- --skip-regex= # Override kubetest2 default in https://github.com/kubernetes-sigs/kubetest2/blob/9f385d26316f5256755bb8fe333970aa5759ec7f/pkg/testers/node/node.go#L92
846-
- '--test-args=--feature-gates="DynamicResourceAllocation=true" --service-feature-gates="DynamicResourceAllocation=true" --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --container-runtime-process-name=/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
846+
- '--test-args=--container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --container-runtime-process-name=/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
847847
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/dra/image-config-containerd-1.7.yaml
848848
resources:
849849
limits:
@@ -865,7 +865,7 @@ presubmits:
865865
preset-k8s-ssh: "true"
866866
annotations:
867867
testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-presubmits, sig-node-containerd
868-
description: Runs E2E node tests for Dynamic Resource Allocation beta features with containerd 2.0
868+
description: Runs E2E node tests for Dynamic Resource Allocation on-by-default features with containerd 2.0
869869
testgrid-alert-email: [email protected], [email protected]
870870
decorate: true
871871
decoration_config:
@@ -892,10 +892,10 @@ presubmits:
892892
- --repo-root=.
893893
- --gcp-zone=us-central1-b
894894
- --parallelism=1
895-
- '--label-filter=DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } && !FeatureGate:ResourceHealthStatus && !Flaky && !Slow'
895+
- '--label-filter=DRA && Feature: isSubsetOf { DynamicResourceAllocation } && !Flaky && !Slow'
896896
- --timeout=60m
897897
- --skip-regex= # Override kubetest2 default in https://github.com/kubernetes-sigs/kubetest2/blob/9f385d26316f5256755bb8fe333970aa5759ec7f/pkg/testers/node/node.go#L92
898-
- '--test-args=--feature-gates="DynamicResourceAllocation=true" --service-feature-gates="DynamicResourceAllocation=true" --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --container-runtime-process-name=/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
898+
- '--test-args=--container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --container-runtime-process-name=/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
899899
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-2.0/image-config.yaml
900900
resources:
901901
limits:

config/jobs/kubernetes/sig-node/dra-ci.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ periodics:
585585
preset-k8s-ssh: "true"
586586
annotations:
587587
testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-cri-o, sig-release-master-informing
588-
description: Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v1
588+
description: Runs E2E node tests for Dynamic Resource Allocation on-by-default features with CRI-O using cgroup v1
589589
590590
fork-per-release: "true"
591591
fork-per-release-periodic-interval: 24h
@@ -616,10 +616,10 @@ periodics:
616616
- --repo-root=.
617617
- --gcp-zone=us-central1-b
618618
- --parallelism=1
619-
- '--label-filter=DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } && !FeatureGate:ResourceHealthStatus && !Flaky'
619+
- '--label-filter=DRA && Feature: isSubsetOf { DynamicResourceAllocation } && !Flaky'
620620
- --timeout=60m
621621
- --skip-regex= # Override kubetest2 default in https://github.com/kubernetes-sigs/kubetest2/blob/9f385d26316f5256755bb8fe333970aa5759ec7f/pkg/testers/node/node.go#L92
622-
- '--test-args=--feature-gates="DynamicResourceAllocation=true" --service-feature-gates="DynamicResourceAllocation=true" --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
622+
- '--test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
623623
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv1.yaml
624624
env:
625625
- name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
@@ -644,7 +644,7 @@ periodics:
644644
preset-k8s-ssh: "true"
645645
annotations:
646646
testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-cri-o, sig-release-master-informing
647-
description: Runs E2E node tests for Dynamic Resource Allocation beta features with CRI-O using cgroup v2
647+
description: Runs E2E node tests for Dynamic Resource Allocation on-by-default features with CRI-O using cgroup v2
648648
649649
fork-per-release: "true"
650650
fork-per-release-periodic-interval: 24h
@@ -675,10 +675,10 @@ periodics:
675675
- --repo-root=.
676676
- --gcp-zone=us-central1-b
677677
- --parallelism=1
678-
- '--label-filter=DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } && !FeatureGate:ResourceHealthStatus && !Flaky'
678+
- '--label-filter=DRA && Feature: isSubsetOf { DynamicResourceAllocation } && !Flaky'
679679
- --timeout=60m
680680
- --skip-regex= # Override kubetest2 default in https://github.com/kubernetes-sigs/kubetest2/blob/9f385d26316f5256755bb8fe333970aa5759ec7f/pkg/testers/node/node.go#L92
681-
- '--test-args=--feature-gates="DynamicResourceAllocation=true" --service-feature-gates="DynamicResourceAllocation=true" --container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
681+
- '--test-args=--container-runtime-endpoint=unix:///var/run/crio/crio.sock --container-runtime-process-name=/usr/local/bin/crio --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/crio.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"'
682682
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/crio/latest/image-config-cgroupv2.yaml
683683
env:
684684
- name: IGNITION_INJECT_GCE_SSH_PUBLIC_KEY_FILE
@@ -703,7 +703,7 @@ periodics:
703703
preset-k8s-ssh: "true"
704704
annotations:
705705
testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-containerd, sig-release-master-informing
706-
description: Runs E2E node tests for Dynamic Resource Allocation beta features with containerd 1.7
706+
description: Runs E2E node tests for Dynamic Resource Allocation on-by-default features with containerd 1.7
707707
708708
fork-per-release: "true"
709709
fork-per-release-periodic-interval: 24h
@@ -734,10 +734,10 @@ periodics:
734734
- --repo-root=.
735735
- --gcp-zone=us-central1-b
736736
- --parallelism=1
737-
- '--label-filter=DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } && !FeatureGate:ResourceHealthStatus && !Flaky'
737+
- '--label-filter=DRA && Feature: isSubsetOf { DynamicResourceAllocation } && !Flaky'
738738
- --timeout=60m
739739
- --skip-regex= # Override kubetest2 default in https://github.com/kubernetes-sigs/kubetest2/blob/9f385d26316f5256755bb8fe333970aa5759ec7f/pkg/testers/node/node.go#L92
740-
- '--test-args=--feature-gates="DynamicResourceAllocation=true" --service-feature-gates="DynamicResourceAllocation=true" --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --container-runtime-process-name=/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
740+
- '--test-args=--container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --container-runtime-process-name=/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
741741
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/dra/image-config-containerd-1.7.yaml
742742
resources:
743743
limits:
@@ -755,7 +755,7 @@ periodics:
755755
preset-k8s-ssh: "true"
756756
annotations:
757757
testgrid-dashboards: sig-node-dynamic-resource-allocation, sig-node-containerd, sig-release-master-informing
758-
description: Runs E2E node tests for Dynamic Resource Allocation beta features with containerd 2.0
758+
description: Runs E2E node tests for Dynamic Resource Allocation on-by-default features with containerd 2.0
759759
760760
fork-per-release: "true"
761761
fork-per-release-periodic-interval: 24h
@@ -789,10 +789,10 @@ periodics:
789789
- --repo-root=.
790790
- --gcp-zone=us-central1-b
791791
- --parallelism=1
792-
- '--label-filter=DRA && Feature: isSubsetOf { OffByDefault, DynamicResourceAllocation } && !FeatureGate:ResourceHealthStatus && !Flaky'
792+
- '--label-filter=DRA && Feature: isSubsetOf { DynamicResourceAllocation } && !Flaky'
793793
- --timeout=60m
794794
- --skip-regex= # Override kubetest2 default in https://github.com/kubernetes-sigs/kubetest2/blob/9f385d26316f5256755bb8fe333970aa5759ec7f/pkg/testers/node/node.go#L92
795-
- '--test-args=--feature-gates="DynamicResourceAllocation=true" --service-feature-gates="DynamicResourceAllocation=true" --container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --container-runtime-process-name=/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
795+
- '--test-args=--container-runtime-endpoint=unix:///var/run/containerd/containerd.sock --container-runtime-process-name=/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service --kubelet-cgroups=/system.slice/kubelet.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"'
796796
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/containerd-release-2.0/image-config.yaml
797797
resources:
798798
limits:

0 commit comments

Comments
 (0)