Skip to content

Commit adecec9

Browse files
authored
Merge pull request kubernetes#129132 from carlory/sig-network
network e2e tests: add feature-gate label when these tests depend feature-gate
2 parents 410dd29 + 3698050 commit adecec9

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

test/e2e/network/dns.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ import (
2525
v1 "k8s.io/api/core/v1"
2626
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2727
"k8s.io/apimachinery/pkg/util/wait"
28+
"k8s.io/kubernetes/pkg/features"
2829
"k8s.io/kubernetes/test/e2e/feature"
2930
"k8s.io/kubernetes/test/e2e/framework"
3031
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
@@ -628,8 +629,7 @@ var _ = common.SIGDescribe("DNS", func() {
628629
})
629630
})
630631

631-
// TODO replace WithLabel by framework.WithFeatureGate(features.RelaxedDNSSearchValidation) once https://github.com/kubernetes/kubernetes/pull/126977 is solved
632-
var _ = common.SIGDescribe("DNS", feature.RelaxedDNSSearchValidation, framework.WithLabel("Feature:Alpha"), func() {
632+
var _ = common.SIGDescribe("DNS", feature.RelaxedDNSSearchValidation, framework.WithFeatureGate(features.RelaxedDNSSearchValidation), func() {
633633
f := framework.NewDefaultFramework("dns")
634634
f.NamespacePodSecurityLevel = admissionapi.LevelBaseline
635635

test/e2e/network/traffic_distribution.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import (
2828
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2929
"k8s.io/apimachinery/pkg/util/intstr"
3030
clientset "k8s.io/client-go/kubernetes"
31+
"k8s.io/kubernetes/pkg/features"
3132
"k8s.io/kubernetes/test/e2e/feature"
3233
"k8s.io/kubernetes/test/e2e/framework"
3334
e2enode "k8s.io/kubernetes/test/e2e/framework/node"
@@ -42,7 +43,7 @@ import (
4243
"github.com/onsi/gomega"
4344
)
4445

45-
var _ = common.SIGDescribe(feature.TrafficDistribution, func() {
46+
var _ = common.SIGDescribe(feature.TrafficDistribution, framework.WithFeatureGate(features.ServiceTrafficDistribution), func() {
4647
f := framework.NewDefaultFramework("traffic-distribution")
4748
f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged
4849

0 commit comments

Comments
 (0)