From d7c454a879932229e96b9af698c644ff5f69263e Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Mon, 19 Feb 2024 19:44:24 -0600 Subject: [PATCH] Remove skip regex from untested k8s versions --- tests/e2e/pkg/tester/skip_regex.go | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/tests/e2e/pkg/tester/skip_regex.go b/tests/e2e/pkg/tester/skip_regex.go index 73c285f319..112c846da4 100644 --- a/tests/e2e/pkg/tester/skip_regex.go +++ b/tests/e2e/pkg/tester/skip_regex.go @@ -22,7 +22,6 @@ import ( "k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/apis/kops/v1alpha2" "k8s.io/kops/upup/pkg/fi" - "k8s.io/kops/upup/pkg/fi/utils" ) const ( @@ -125,7 +124,7 @@ func (t *Tester) setSkipRegexFlag() error { skipRegex += "|In-tree.Volumes.\\[Driver:.gcepd\\].*topology.should.provision.a.volume.and.schedule.a.pod.with.AllowedTopologies" } - if cluster.Spec.LegacyCloudProvider == "gce" || k8sVersion.Minor <= 23 { + if cluster.Spec.LegacyCloudProvider == "gce" { // this tests assumes a custom config for containerd: // https://github.com/kubernetes/test-infra/blob/578d86a7be187214be6ccd60e6ea7317b51aeb15/jobs/e2e_node/containerd/config.toml#L19-L21 // ref: https://github.com/kubernetes/kubernetes/pull/104803 @@ -134,16 +133,6 @@ func (t *Tester) setSkipRegexFlag() error { skipRegex += "|Metadata.Concealment" } - if k8sVersion.Minor == 23 && cluster.Spec.LegacyCloudProvider == "aws" && utils.IsIPv6CIDR(cluster.Spec.NonMasqueradeCIDR) { - // ref: https://github.com/kubernetes/kubernetes/pull/106992 - skipRegex += "|should.not.disrupt.a.cloud.load-balancer.s.connectivity.during.rollout" - } - - if k8sVersion.Minor == 23 { - // beta feature not enabled by default - skipRegex += "|Topology.Hints" - } - if k8sVersion.Minor >= 22 { // this test was being skipped automatically because it isn't applicable with CSIMigration=true which is default // but skipping logic has been changed and now the test is planned for removal