From ff799a31024679e355e9f8d547f9af44469b62fb Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sun, 20 Aug 2023 19:56:19 -0500 Subject: [PATCH] Continue skipping SCTP HostPort tests in older k8s versions After no longer skipping these in kops 1.28, the e2e tests began failing again. It turns out cilium doesn't enable SCTP support by default, it is guarded by a `enable-sctp` config boolean. In k8s 1.27 the test was also renamed and added [Serial], so it is still being skipped on k8s 1.27+ test jobs --- tests/e2e/pkg/tester/skip_regex.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/e2e/pkg/tester/skip_regex.go b/tests/e2e/pkg/tester/skip_regex.go index 05542cf415..68e25dfe3d 100644 --- a/tests/e2e/pkg/tester/skip_regex.go +++ b/tests/e2e/pkg/tester/skip_regex.go @@ -84,11 +84,17 @@ func (t *Tester) setSkipRegexFlag() error { if isPre28 { // These may be fixed in Cilium 1.13 but skipping for now skipRegex += "|Service.with.multiple.ports.specified.in.multiple.EndpointSlices" - skipRegex += "|should.create.a.Pod.with.SCTP.HostPort" // https://github.com/cilium/cilium/issues/18241 skipRegex += "|Services.should.create.endpoints.for.unready.pods" skipRegex += "|Services.should.be.able.to.connect.to.terminating.and.unready.endpoints.if.PublishNotReadyAddresses.is.true" } + if k8sVersion.Minor < 27 { + // Partially implemented in Cilium 1.13 but kops doesn't enable it + // Ref: https://github.com/cilium/cilium/pull/20033 + // K8s 1.27+ added [Serial] to the test case, which is skipped by default + // Ref: https://github.com/kubernetes/kubernetes/pull/113335 + skipRegex += "|should.create.a.Pod.with.SCTP.HostPort" + } } else if networking.KubeRouter != nil { skipRegex += "|load-balancer|hairpin|affinity\\stimeout|service\\.kubernetes\\.io|CLOSE_WAIT" skipRegex += "|EndpointSlice.should.support.a.Service.with.multiple"