From 5424fb17a05a18572d69320ba7c3e93c559c7a8a Mon Sep 17 00:00:00 2001 From: Sergey Kanzhelev Date: Mon, 8 Nov 2021 19:48:31 +0000 Subject: [PATCH 1/2] remove DynamicKubeletConfig feature gate from all tests definitions --- .../containerd/containerd-presubmit-jobs.yaml | 2 ++ .../jobs/kubernetes/sig-node/containerd.yaml | 6 ++++-- .../jobs/kubernetes/sig-node/node-kubelet.yaml | 14 ++++++++------ .../sig-node/sig-node-presubmit.yaml | 18 +++++++++--------- releng/test_config.yaml | 3 +-- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml b/config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml index 3cc9d323130e..beb1cc13d9b3 100644 --- a/config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml +++ b/config/jobs/containerd/containerd/containerd-presubmit-jobs.yaml @@ -56,6 +56,8 @@ presubmits: env: - name: USE_TEST_INFRA_LOG_DUMPING value: "true" + # Feature:DynamicKubeletConfig is deprecated and soon will be removed so tests are skipped. + # If we want to run these tests, we need a separate job for it. command: - sh - -c diff --git a/config/jobs/kubernetes/sig-node/containerd.yaml b/config/jobs/kubernetes/sig-node/containerd.yaml index fda19b9f29c6..0c5dc933b273 100644 --- a/config/jobs/kubernetes/sig-node/containerd.yaml +++ b/config/jobs/kubernetes/sig-node/containerd.yaml @@ -267,6 +267,8 @@ periodics: - '--node-test-args=--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"' - --node-tests=true - --provider=gce + # Feature:DynamicKubeletConfig is deprecated and soon will be removed so tests are skipped. + # If we want to run these tests, we need a separate job for it. - --test_args=--nodes=8 --focus="\[NodeFeature:.+\]|\[NodeFeature\]" --skip="\[Flaky\]|\[Serial\]|\[NodeFeature:DynamicKubeletConfig\]" - --timeout=65m env: @@ -743,7 +745,7 @@ periodics: - --deployment=node - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-central1-b - - '--node-test-args=--feature-gates=DynamicKubeletConfig=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"' + - '--node-test-args=--container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/home/containerd/usr/local/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd\"]}"' - --node-tests=true - --provider=gce - --test_args=--nodes=1 --skip="\[Flaky\]" @@ -1011,7 +1013,7 @@ periodics: - --deployment=node - --gcp-project=cri-containerd-node-e2e - --gcp-zone=us-west1-b - - '--node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' + - '--node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]" diff --git a/config/jobs/kubernetes/sig-node/node-kubelet.yaml b/config/jobs/kubernetes/sig-node/node-kubelet.yaml index 8571d970769b..2df5a043da43 100644 --- a/config/jobs/kubernetes/sig-node/node-kubelet.yaml +++ b/config/jobs/kubernetes/sig-node/node-kubelet.yaml @@ -191,9 +191,11 @@ periodics: - --gcp-project-type=node-e2e-project - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial.yaml - - --node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" + - --node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --node-tests=true - --provider=gce + # Feature:DynamicKubeletConfig is deprecated and soon will be removed so tests are skipped. + # If we want to run these tests, we need a separate job for it. - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[Feature:DynamicKubeletConfig\]" - --timeout=240m env: @@ -228,7 +230,7 @@ periodics: - --gcp-project-type=node-e2e-project - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/image-config-serial.yaml - - '--node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' + - '--node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[Feature:DynamicKubeletConfig\]" @@ -267,7 +269,7 @@ periodics: - --gcp-project-type=node-e2e-project - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial.yaml - - --node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" + - --node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[NodeFeature:Eviction\]" @@ -297,7 +299,7 @@ periodics: - --gcp-project-type=node-e2e-project - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial-cpu-manager.yaml - - --node-test-args=--feature-gates=DynamicKubeletConfig=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" + - --node-test-args=--kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Feature:CPUManager\]" @@ -328,7 +330,7 @@ periodics: - --gcp-project-type=node-e2e-project - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial-cpu-manager.yaml - - --node-test-args=--feature-gates=DynamicKubeletConfig=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" + - --node-test-args=--kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Feature:TopologyManager\]" @@ -390,7 +392,7 @@ periodics: - --gcp-project-type=node-e2e-project - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial-cpu-manager.yaml - - --node-test-args=--feature-gates=DynamicKubeletConfig=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" + - --node-test-args=--kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Feature:MemoryManager\]" diff --git a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml index 50320329d291..e83d2e2583de 100644 --- a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml +++ b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml @@ -469,10 +469,10 @@ presubmits: - --deployment=node - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial.yaml - - --node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" + - --node-test-args=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --node-tests=true - --provider=gce - - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]" + - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]|\[NodeFeature:DynamicKubeletConfig\]" - --timeout=240m env: - name: GOPATH @@ -509,7 +509,7 @@ presubmits: - --deployment=node - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial.yaml - - --node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" + - --node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]" @@ -549,7 +549,7 @@ presubmits: - --deployment=node - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/image-config-serial.yaml - - --node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" + - --node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]" @@ -613,7 +613,7 @@ presubmits: - --parallelism=1 - --focus-regex=\[Serial\] - --skip-regex=\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\] - - --test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" + - --test-args=--feature-gates=LocalStorageCapacityIsolation=true --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/" - --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/image-config-serial.yaml - name: pull-kubernetes-node-kubelet-serial-containerd @@ -641,7 +641,7 @@ presubmits: - --deployment=node - --gcp-zone=us-west1-b - --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/containerd/image-config-serial.yaml - - '--node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' + - '--node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\]" @@ -705,7 +705,7 @@ presubmits: - --parallelism=1 - --focus-regex=\[Serial\] - --skip-regex=\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[NodeFeature:Eviction\] - - '--test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' + - '--test-args=--feature-gates=LocalStorageCapacityIsolation=true --container-runtime=remote --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"' - --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/image-config-serial.yaml - name: pull-kubernetes-node-kubelet-eviction always_run: false @@ -1049,7 +1049,7 @@ presubmits: - --env=KUBE_SSH_USER=core - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - - '--node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --container-runtime=remote --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 --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' + - '--node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --container-runtime=remote --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 --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[Feature:Eviction\]" @@ -1087,7 +1087,7 @@ presubmits: - --env=KUBE_SSH_USER=core - --gcp-project=k8s-jkns-pr-node-e2e - --gcp-zone=us-west1-b - - '--node-test-args=--feature-gates=DynamicKubeletConfig=true,LocalStorageCapacityIsolation=true --container-runtime=remote --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 --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' + - '--node-test-args=--feature-gates=LocalStorageCapacityIsolation=true --container-runtime=remote --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 --non-masquerade-cidr=0.0.0.0/0" --extra-log="{\"name\": \"crio.log\", \"journalctl\": [\"-u\", \"crio\"]}"' - --node-tests=true - --provider=gce - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeSpecialFeature:.+\]|\[NodeSpecialFeature\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]|\[Feature:Eviction\]" diff --git a/releng/test_config.yaml b/releng/test_config.yaml index ec9adf66afc4..27802dba1587 100644 --- a/releng/test_config.yaml +++ b/releng/test_config.yaml @@ -265,7 +265,7 @@ testSuites: alphafeatures: args: - --timeout=180m - - --test_args=--ginkgo.focus=\[Feature:(ExternalTrafficLocalOnly|DynamicKubeletConfig)\] + - --test_args=--ginkgo.focus=\[Feature:(ExternalTrafficLocalOnly)\] --minStartupPods=8 cluster: k8s-infra-prow-build default: @@ -412,4 +412,3 @@ nodeTestSuites: args: - --timeout=300m - --test_args=--nodes=1 --focus="\[Serial\]" --skip="\[Flaky\]|\[Benchmark\]|\[NodeAlphaFeature:.+\]|\[NodeAlphaFeature\]" - - --node-test-args=--feature-gates=DynamicKubeletConfig=true From b4d6ba5b2c79123a819eede659f248a36faa0988 Mon Sep 17 00:00:00 2001 From: Sergey Kanzhelev Date: Thu, 11 Nov 2021 05:28:05 +0000 Subject: [PATCH 2/2] generated: Run --- config/jobs/kubernetes/generated/generated.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/jobs/kubernetes/generated/generated.yaml b/config/jobs/kubernetes/generated/generated.yaml index fc4b248c51fc..645db5c0e7c2 100644 --- a/config/jobs/kubernetes/generated/generated.yaml +++ b/config/jobs/kubernetes/generated/generated.yaml @@ -721,7 +721,7 @@ periodics: - --extract=ci/latest-1.19 - --extract-ci-bucket=k8s-release-dev - --timeout=180m - - --test_args=--ginkgo.focus=\[Feature:(ExternalTrafficLocalOnly|DynamicKubeletConfig)\] --minStartupPods=8 + - --test_args=--ginkgo.focus=\[Feature:(ExternalTrafficLocalOnly)\] --minStartupPods=8 - --env=KUBE_PROXY_DAEMONSET=true - --env=ENABLE_POD_PRIORITY=true - --env=KUBE_FEATURE_GATES=AllAlpha=true,CSIMigration=false