kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix more e2e skips

This commit is contained in:
Ole Markus With 2022-08-13 19:08:16 +02:00
parent 01d4a7652e
commit 04581c3ae2
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/e2e/pkg/tester/skip_regex.go
View File

@ -18,7 +18,6 @@ package tester
import ( import (
"regexp" "regexp"
"strings"
"k8s.io/kops/pkg/apis/kops/util" "k8s.io/kops/pkg/apis/kops/util"
"k8s.io/kops/upup/pkg/fi" "k8s.io/kops/upup/pkg/fi"
@ -57,8 +56,7 @@ func (t *Tester) setSkipRegexFlag() error {
skipRegex += "|external.IP.is.not.assigned.to.a.node" skipRegex += "|external.IP.is.not.assigned.to.a.node"
// https://github.com/cilium/cilium/issues/14287 // https://github.com/cilium/cilium/issues/14287
skipRegex += "|same.port.number.but.different.protocols|same.hostPort.but.different.hostIP.and.protocol" skipRegex += "|same.port.number.but.different.protocols|same.hostPort.but.different.hostIP.and.protocol"
if strings.Contains(cluster.Spec.KubernetesVersion, "v1.23") || strings.Contains(cluster.Spec.KubernetesVersion, "v1.24") || strings.Contains(cluster.Spec.KubernetesVersion, "v1.25") { if k8sVersion.Minor >= 22 {
// Reassess after https://github.com/kubernetes/kubernetes/pull/102643 is merged
// ref: // ref:
// https://github.com/kubernetes/kubernetes/issues/96717 // https://github.com/kubernetes/kubernetes/issues/96717
// https://github.com/cilium/cilium/issues/5719 // https://github.com/cilium/cilium/issues/5719
@ -87,7 +85,7 @@ func (t *Tester) setSkipRegexFlag() error {
skipRegex += "|In-tree.Volumes.\\[Driver:.gcepd\\].*topology.should.provision.a.volume.and.schedule.a.pod.with.AllowedTopologies" skipRegex += "|In-tree.Volumes.\\[Driver:.gcepd\\].*topology.should.provision.a.volume.and.schedule.a.pod.with.AllowedTopologies"
} }
if k8sVersion.Minor <= 22 { if k8sVersion.Minor <= 23 {
// this tests assumes a custom config for containerd: // this tests assumes a custom config for containerd:
// https://github.com/kubernetes/test-infra/blob/578d86a7be187214be6ccd60e6ea7317b51aeb15/jobs/e2e_node/containerd/config.toml#L19-L21 // https://github.com/kubernetes/test-infra/blob/578d86a7be187214be6ccd60e6ea7317b51aeb15/jobs/e2e_node/containerd/config.toml#L19-L21
// ref: https://github.com/kubernetes/kubernetes/pull/104803 // ref: https://github.com/kubernetes/kubernetes/pull/104803
@ -104,9 +102,10 @@ func (t *Tester) setSkipRegexFlag() error {
skipRegex += "|Topology.Hints" skipRegex += "|Topology.Hints"
} }
if k8sVersion.Minor == 25 { if k8sVersion.Minor >= 22 {
// this test was being skipped automatically because it isn't applicable with CSIMigration=true which is default // 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 // but skipping logic has been changed and now the test is planned for removal
// Should be skipped on all versions we enable CSI drivers on
// ref: https://github.com/kubernetes/kubernetes/pull/109649#issuecomment-1108574843 // ref: https://github.com/kubernetes/kubernetes/pull/109649#issuecomment-1108574843
skipRegex += "|should.verify.that.all.nodes.have.volume.limits" skipRegex += "|should.verify.that.all.nodes.have.volume.limits"
} }