From caba23a508d0d286e7add675ca0cc156b5f51a8f Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Thu, 28 Mar 2024 11:35:54 -0400 Subject: [PATCH] cloud/gcp/cluster_upgrade should only run on GCE Signed-off-by: Davanum Srinivas --- test/e2e/cloud/gcp/cluster_upgrade.go | 9 +++++++++ test/e2e/cloud/gcp/gke_node_pools.go | 2 +- test/e2e/cloud/gcp/kubelet_security.go | 2 ++ test/e2e/cloud/gcp/node_lease.go | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/test/e2e/cloud/gcp/cluster_upgrade.go b/test/e2e/cloud/gcp/cluster_upgrade.go index af1e27fbf08..88e4ddc8090 100644 --- a/test/e2e/cloud/gcp/cluster_upgrade.go +++ b/test/e2e/cloud/gcp/cluster_upgrade.go @@ -22,6 +22,7 @@ import ( "k8s.io/kubernetes/test/e2e/cloud/gcp/common" "k8s.io/kubernetes/test/e2e/feature" "k8s.io/kubernetes/test/e2e/framework" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" "k8s.io/kubernetes/test/e2e/upgrades" "k8s.io/kubernetes/test/e2e/upgrades/apps" "k8s.io/kubernetes/test/e2e/upgrades/autoscaling" @@ -58,6 +59,10 @@ var _ = SIGDescribe("Upgrade", feature.Upgrade, func() { f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged testFrameworks := upgrades.CreateUpgradeFrameworks(upgradeTests) + ginkgo.BeforeEach(func() { + e2eskipper.SkipUnlessProviderIs("gce", "gke") + }) + // Create the frameworks here because we can only create them // in a "Describe". ginkgo.Describe("master upgrade", func() { @@ -97,6 +102,10 @@ var _ = SIGDescribe("Downgrade", feature.Downgrade, func() { f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged testFrameworks := upgrades.CreateUpgradeFrameworks(upgradeTests) + ginkgo.BeforeEach(func() { + e2eskipper.SkipUnlessProviderIs("gce", "gke") + }) + ginkgo.Describe("cluster downgrade", func() { f.It("should maintain a functioning cluster", feature.ClusterDowngrade, func(ctx context.Context) { upgCtx, err := common.GetUpgradeContext(f.ClientSet.Discovery()) diff --git a/test/e2e/cloud/gcp/gke_node_pools.go b/test/e2e/cloud/gcp/gke_node_pools.go index cb801c14c50..99eeb9be74a 100644 --- a/test/e2e/cloud/gcp/gke_node_pools.go +++ b/test/e2e/cloud/gcp/gke_node_pools.go @@ -36,7 +36,7 @@ var _ = SIGDescribe("GKE node pools", feature.GKENodePool, func() { f.NamespacePodSecurityLevel = admissionapi.LevelPrivileged ginkgo.BeforeEach(func() { - e2eskipper.SkipUnlessProviderIs("gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") }) f.It("should create a cluster with multiple node pools", feature.GKENodePool, func(ctx context.Context) { diff --git a/test/e2e/cloud/gcp/kubelet_security.go b/test/e2e/cloud/gcp/kubelet_security.go index a4c9dfc4c82..c054d921360 100644 --- a/test/e2e/cloud/gcp/kubelet_security.go +++ b/test/e2e/cloud/gcp/kubelet_security.go @@ -29,6 +29,7 @@ import ( "k8s.io/kubernetes/test/e2e/framework" e2ekubelet "k8s.io/kubernetes/test/e2e/framework/kubelet" e2enode "k8s.io/kubernetes/test/e2e/framework/node" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" admissionapi "k8s.io/pod-security-admission/api" "github.com/onsi/ginkgo/v2" @@ -43,6 +44,7 @@ var _ = SIGDescribe("Ports Security Check", feature.KubeletSecurity, func() { var nodeName string ginkgo.BeforeEach(func(ctx context.Context) { + e2eskipper.SkipUnlessProviderIs("gce", "gke") var err error node, err = e2enode.GetRandomReadySchedulableNode(ctx, f.ClientSet) framework.ExpectNoError(err) diff --git a/test/e2e/cloud/gcp/node_lease.go b/test/e2e/cloud/gcp/node_lease.go index 58aab52d89c..8f74902f47c 100644 --- a/test/e2e/cloud/gcp/node_lease.go +++ b/test/e2e/cloud/gcp/node_lease.go @@ -44,6 +44,7 @@ var _ = SIGDescribe(framework.WithDisruptive(), "NodeLease", func() { var group string ginkgo.BeforeEach(func(ctx context.Context) { + e2eskipper.SkipUnlessProviderIs("gce", "gke") c = f.ClientSet ns = f.Namespace.Name systemPods, err := e2epod.GetPodsInNamespace(ctx, c, ns, map[string]string{})