From e977f601b3746c672bd7d0ecfea665ca0dccafad Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sat, 14 Sep 2024 18:20:51 +0000 Subject: [PATCH 1/4] tag kube-proxy migration as serial and disruptive --- test/e2e/cloud/gcp/network/kube_proxy_migration.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/cloud/gcp/network/kube_proxy_migration.go b/test/e2e/cloud/gcp/network/kube_proxy_migration.go index 73227450929..6d8615ccc84 100644 --- a/test/e2e/cloud/gcp/network/kube_proxy_migration.go +++ b/test/e2e/cloud/gcp/network/kube_proxy_migration.go @@ -46,7 +46,7 @@ func kubeProxyDaemonSetExtraEnvs(enableKubeProxyDaemonSet bool) []string { return []string{fmt.Sprintf("KUBE_PROXY_DAEMONSET=%v", enableKubeProxyDaemonSet)} } -var _ = SIGDescribe("kube-proxy migration", feature.KubeProxyDaemonSetMigration, func() { +var _ = SIGDescribe("kube-proxy migration", framework.WithSerial(), framework.WithDisruptive(), feature.KubeProxyDaemonSetMigration, func() { f := framework.NewDefaultFramework("kube-proxy-ds-migration") f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged upgradeTestFrameworks := upgrades.CreateUpgradeFrameworks(upgradeTests) From 32099f69f602d8ead35d8e723e011a7b5d94866c Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sat, 14 Sep 2024 19:01:09 +0000 Subject: [PATCH 2/4] remove slow tag on e2e test The test Variable Expansion should fail substituting values in a volume subpath with backticks takes 12 seconds, it should not be tagged as slow --- test/conformance/testdata/conformance.yaml | 2 +- test/e2e/common/node/expansion.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index f8c50c699dc..0cde76de6fa 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -2663,7 +2663,7 @@ file: test/e2e/common/node/expansion.go - testname: VolumeSubpathEnvExpansion, subpath with backticks codename: '[sig-node] Variable Expansion should fail substituting values in a volume - subpath with backticks [Slow] [Conformance]' + subpath with backticks [Conformance]' description: Make sure a container's subpath can not be set using an expansion of environment variables when backticks are supplied. release: v1.19 diff --git a/test/e2e/common/node/expansion.go b/test/e2e/common/node/expansion.go index 48f6f410e5e..0d8e7eaedfc 100644 --- a/test/e2e/common/node/expansion.go +++ b/test/e2e/common/node/expansion.go @@ -153,7 +153,7 @@ var _ = SIGDescribe("Variable Expansion", func() { Testname: VolumeSubpathEnvExpansion, subpath with backticks Description: Make sure a container's subpath can not be set using an expansion of environment variables when backticks are supplied. */ - framework.ConformanceIt("should fail substituting values in a volume subpath with backticks", f.WithSlow(), func(ctx context.Context) { + framework.ConformanceIt("should fail substituting values in a volume subpath with backticks", func(ctx context.Context) { envVars := []v1.EnvVar{ { From 22d79b998a8b36bba80bc8a55c136014e8e17d5c Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sat, 14 Sep 2024 19:06:21 +0000 Subject: [PATCH 3/4] remove e2e slow tag for VolumeSubpathEnvExpansion Kubernetes e2e suite: [It] [sig-node] Variable Expansion should fail substituting values in a volume subpath with absolute path [Slow] [Conformance] test takes 37 seconds to run --- test/conformance/testdata/conformance.yaml | 2 +- test/e2e/common/node/expansion.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 0cde76de6fa..386b7864aec 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -2656,7 +2656,7 @@ file: test/e2e/common/node/expansion.go - testname: VolumeSubpathEnvExpansion, subpath with absolute path codename: '[sig-node] Variable Expansion should fail substituting values in a volume - subpath with absolute path [Slow] [Conformance]' + subpath with absolute path [Conformance]' description: Make sure a container's subpath can not be set using an expansion of environment variables when absolute path is supplied. release: v1.19 diff --git a/test/e2e/common/node/expansion.go b/test/e2e/common/node/expansion.go index 0d8e7eaedfc..68613cfd87e 100644 --- a/test/e2e/common/node/expansion.go +++ b/test/e2e/common/node/expansion.go @@ -187,7 +187,7 @@ var _ = SIGDescribe("Variable Expansion", func() { Testname: VolumeSubpathEnvExpansion, subpath with absolute path Description: Make sure a container's subpath can not be set using an expansion of environment variables when absolute path is supplied. */ - framework.ConformanceIt("should fail substituting values in a volume subpath with absolute path", f.WithSlow(), func(ctx context.Context) { + framework.ConformanceIt("should fail substituting values in a volume subpath with absolute path", func(ctx context.Context) { absolutePath := "/tmp" if framework.NodeOSDistroIs("windows") { // Windows does not typically have a C:\tmp folder. From 8cb7c54ce7eeaa497f990668c976f022c24f409f Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sat, 14 Sep 2024 19:09:16 +0000 Subject: [PATCH 4/4] e2e VolumeSubpathEnvExpansion should not be tagged as slow The test [sig-node] Variable Expansion should succeed in writing subpaths in container takes 1m5s so it should no be tagged as slow" --- test/conformance/testdata/conformance.yaml | 2 +- test/e2e/common/node/expansion.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/conformance/testdata/conformance.yaml b/test/conformance/testdata/conformance.yaml index 386b7864aec..dd710f6e04b 100755 --- a/test/conformance/testdata/conformance.yaml +++ b/test/conformance/testdata/conformance.yaml @@ -2670,7 +2670,7 @@ file: test/e2e/common/node/expansion.go - testname: VolumeSubpathEnvExpansion, subpath test writes codename: '[sig-node] Variable Expansion should succeed in writing subpaths in container - [Slow] [Conformance]' + [Conformance]' description: "Verify that a subpath expansion can be used to write files into subpaths. 1.\tvalid subpathexpr starts a container running 2.\ttest for valid subpath writes 3.\tsuccessful expansion of the subpathexpr isn't required for volume cleanup" diff --git a/test/e2e/common/node/expansion.go b/test/e2e/common/node/expansion.go index 68613cfd87e..6417ff9ff4c 100644 --- a/test/e2e/common/node/expansion.go +++ b/test/e2e/common/node/expansion.go @@ -298,7 +298,7 @@ var _ = SIGDescribe("Variable Expansion", func() { 3. successful expansion of the subpathexpr isn't required for volume cleanup */ - framework.ConformanceIt("should succeed in writing subpaths in container", f.WithSlow(), func(ctx context.Context) { + framework.ConformanceIt("should succeed in writing subpaths in container", func(ctx context.Context) { envVars := []v1.EnvVar{ {