github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-05 10:19:50 +00:00
Code Issues Projects Releases Wiki Activity

cloud/gcp/cluster_upgrade should only run on GCE

Browse Source 
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
Davanum Srinivas 2024-03-28 11:35:54 -04:00
parent f4e246bc93
commit caba23a508
No known key found for this signature in database
GPG Key ID: 80D83A796103BF59
4 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/cloud/gcp/cluster_upgrade.go
View File

@ -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())

2
test/e2e/cloud/gcp/gke_node_pools.go
View File

@ -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) {

2
test/e2e/cloud/gcp/kubelet_security.go
View File

@ -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)

1
test/e2e/cloud/gcp/node_lease.go
View File

@ -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{})