diff --git a/test/e2e/instrumentation/logging/elasticsearch/BUILD b/test/e2e/instrumentation/logging/elasticsearch/BUILD index 02b966671cb..da7bc13b854 100644 --- a/test/e2e/instrumentation/logging/elasticsearch/BUILD +++ b/test/e2e/instrumentation/logging/elasticsearch/BUILD @@ -22,6 +22,7 @@ go_library( "//test/e2e/framework:go_default_library", "//test/e2e/framework/pod:go_default_library", "//test/e2e/framework/service:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/e2e/instrumentation/common:go_default_library", "//test/e2e/instrumentation/logging/utils:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", diff --git a/test/e2e/instrumentation/logging/elasticsearch/basic.go b/test/e2e/instrumentation/logging/elasticsearch/basic.go index 6853eadb025..b3e1eb3a12b 100644 --- a/test/e2e/instrumentation/logging/elasticsearch/basic.go +++ b/test/e2e/instrumentation/logging/elasticsearch/basic.go @@ -20,6 +20,7 @@ import ( "time" "k8s.io/kubernetes/test/e2e/framework" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common" "k8s.io/kubernetes/test/e2e/instrumentation/logging/utils" @@ -33,7 +34,7 @@ var _ = instrumentation.SIGDescribe("Cluster level logging using Elasticsearch [ // TODO: For now assume we are only testing cluster logging with Elasticsearch // on GCE. Once we are sure that Elasticsearch cluster level logging // works for other providers we should widen this scope of this test. - framework.SkipUnlessProviderIs("gce") + e2eskipper.SkipUnlessProviderIs("gce") }) ginkgo.It("should check that logs from containers are ingested into Elasticsearch", func() { diff --git a/test/e2e/instrumentation/logging/elasticsearch/kibana.go b/test/e2e/instrumentation/logging/elasticsearch/kibana.go index bb0a2ff72bf..8795e783b70 100644 --- a/test/e2e/instrumentation/logging/elasticsearch/kibana.go +++ b/test/e2e/instrumentation/logging/elasticsearch/kibana.go @@ -22,13 +22,14 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" + "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2eservice "k8s.io/kubernetes/test/e2e/framework/service" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common" "github.com/onsi/ginkgo" - "k8s.io/apimachinery/pkg/util/wait" ) var _ = instrumentation.SIGDescribe("Kibana Logging Instances Is Alive [Feature:Elasticsearch]", func() { @@ -38,7 +39,7 @@ var _ = instrumentation.SIGDescribe("Kibana Logging Instances Is Alive [Feature: // TODO: For now assume we are only testing cluster logging with Elasticsearch // and Kibana on GCE. Once we are sure that Elasticsearch and Kibana cluster level logging // works for other providers we should widen this scope of this test. - framework.SkipUnlessProviderIs("gce") + e2eskipper.SkipUnlessProviderIs("gce") }) ginkgo.It("should check that the Kibana logging instance is alive", func() { diff --git a/test/e2e/instrumentation/logging/generic_soak.go b/test/e2e/instrumentation/logging/generic_soak.go index c97cc707e7e..075788fcd4a 100644 --- a/test/e2e/instrumentation/logging/generic_soak.go +++ b/test/e2e/instrumentation/logging/generic_soak.go @@ -23,13 +23,14 @@ import ( "sync" "time" - "github.com/onsi/ginkgo" "k8s.io/api/core/v1" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/config" e2enode "k8s.io/kubernetes/test/e2e/framework/node" instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common" imageutils "k8s.io/kubernetes/test/utils/image" + + "github.com/onsi/ginkgo" ) var loggingSoak struct { diff --git a/test/e2e/instrumentation/logging/stackdriver/BUILD b/test/e2e/instrumentation/logging/stackdriver/BUILD index b6076a80fe7..762658846df 100644 --- a/test/e2e/instrumentation/logging/stackdriver/BUILD +++ b/test/e2e/instrumentation/logging/stackdriver/BUILD @@ -19,6 +19,7 @@ go_library( "//staging/src/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//test/e2e/framework:go_default_library", "//test/e2e/framework/node:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/e2e/instrumentation/common:go_default_library", "//test/e2e/instrumentation/logging/utils:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library", diff --git a/test/e2e/instrumentation/logging/stackdriver/basic.go b/test/e2e/instrumentation/logging/stackdriver/basic.go index 3524444e7eb..563aa8cb5fd 100644 --- a/test/e2e/instrumentation/logging/stackdriver/basic.go +++ b/test/e2e/instrumentation/logging/stackdriver/basic.go @@ -20,14 +20,15 @@ import ( "fmt" "time" + "k8s.io/apimachinery/pkg/util/json" + "k8s.io/apimachinery/pkg/util/uuid" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common" "k8s.io/kubernetes/test/e2e/instrumentation/logging/utils" "github.com/onsi/ginkgo" - "k8s.io/apimachinery/pkg/util/json" - "k8s.io/apimachinery/pkg/util/uuid" ) const ( @@ -39,7 +40,7 @@ var _ = instrumentation.SIGDescribe("Cluster level logging implemented by Stackd f := framework.NewDefaultFramework("sd-logging") ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") }) ginkgo.It("should ingest logs [Feature:StackdriverLogging]", func() { diff --git a/test/e2e/instrumentation/monitoring/BUILD b/test/e2e/instrumentation/monitoring/BUILD index 98b09629ce9..e5b7a11aa18 100644 --- a/test/e2e/instrumentation/monitoring/BUILD +++ b/test/e2e/instrumentation/monitoring/BUILD @@ -40,6 +40,7 @@ go_library( "//test/e2e/framework/metrics:go_default_library", "//test/e2e/framework/node:go_default_library", "//test/e2e/framework/pod:go_default_library", + "//test/e2e/framework/skipper:go_default_library", "//test/e2e/instrumentation/common:go_default_library", "//test/e2e/scheduling:go_default_library", "//test/utils/image:go_default_library", diff --git a/test/e2e/instrumentation/monitoring/accelerator.go b/test/e2e/instrumentation/monitoring/accelerator.go index 502fb2d5603..e7019193581 100644 --- a/test/e2e/instrumentation/monitoring/accelerator.go +++ b/test/e2e/instrumentation/monitoring/accelerator.go @@ -21,18 +21,20 @@ import ( "os" "time" - "github.com/onsi/ginkgo" - "golang.org/x/oauth2/google" - gcm "google.golang.org/api/monitoring/v3" v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework/gpu" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common" "k8s.io/kubernetes/test/e2e/scheduling" "k8s.io/kubernetes/test/utils/image" + + "github.com/onsi/ginkgo" + "golang.org/x/oauth2/google" + gcm "google.golang.org/api/monitoring/v3" ) // Stackdriver container accelerator metrics, as described here: @@ -45,7 +47,7 @@ var acceleratorMetrics = []string{ var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() { ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") }) f := framework.NewDefaultFramework("stackdriver-monitoring") diff --git a/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go b/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go index 1d3fb91fcf1..de80b129315 100644 --- a/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go +++ b/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go @@ -21,13 +21,14 @@ import ( "os/exec" "strings" - gcm "google.golang.org/api/monitoring/v3" appsv1 "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" rbacv1 "k8s.io/api/rbac/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/test/e2e/framework" imageutils "k8s.io/kubernetes/test/utils/image" + + gcm "google.golang.org/api/monitoring/v3" ) var ( diff --git a/test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go b/test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go index 70ecb179fa0..360fc8b8180 100644 --- a/test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go +++ b/test/e2e/instrumentation/monitoring/custom_metrics_stackdriver.go @@ -20,24 +20,24 @@ import ( "context" "time" - "golang.org/x/oauth2/google" - clientset "k8s.io/client-go/kubernetes" - - "github.com/onsi/ginkgo" - metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common" - gcm "google.golang.org/api/monitoring/v3" "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/selection" "k8s.io/client-go/discovery" cacheddiscovery "k8s.io/client-go/discovery/cached/memory" + clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/restmapper" "k8s.io/kubernetes/test/e2e/framework" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" + instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common" customclient "k8s.io/metrics/pkg/client/custom_metrics" externalclient "k8s.io/metrics/pkg/client/external_metrics" + + "github.com/onsi/ginkgo" + "golang.org/x/oauth2/google" ) const ( @@ -48,7 +48,7 @@ const ( var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() { ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") }) f := framework.NewDefaultFramework("stackdriver-monitoring") diff --git a/test/e2e/instrumentation/monitoring/stackdriver.go b/test/e2e/instrumentation/monitoring/stackdriver.go index d99c599d978..d9ca5c250be 100644 --- a/test/e2e/instrumentation/monitoring/stackdriver.go +++ b/test/e2e/instrumentation/monitoring/stackdriver.go @@ -23,14 +23,14 @@ import ( "os" "time" - "golang.org/x/oauth2/google" - - "github.com/onsi/ginkgo" "k8s.io/apimachinery/pkg/util/wait" "k8s.io/kubernetes/test/e2e/framework" e2eautoscaling "k8s.io/kubernetes/test/e2e/framework/autoscaling" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common" + "github.com/onsi/ginkgo" + "golang.org/x/oauth2/google" gcm "google.golang.org/api/monitoring/v3" ) @@ -60,7 +60,7 @@ var ( var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() { ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") }) f := framework.NewDefaultFramework("stackdriver-monitoring") diff --git a/test/e2e/instrumentation/monitoring/stackdriver_metadata_agent.go b/test/e2e/instrumentation/monitoring/stackdriver_metadata_agent.go index 715c51fb096..15df04e37f7 100644 --- a/test/e2e/instrumentation/monitoring/stackdriver_metadata_agent.go +++ b/test/e2e/instrumentation/monitoring/stackdriver_metadata_agent.go @@ -24,14 +24,16 @@ import ( "reflect" "time" - "github.com/onsi/ginkgo" - "golang.org/x/oauth2/google" "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" "k8s.io/kubernetes/test/e2e/framework" e2epod "k8s.io/kubernetes/test/e2e/framework/pod" + e2eskipper "k8s.io/kubernetes/test/e2e/framework/skipper" instrumentation "k8s.io/kubernetes/test/e2e/instrumentation/common" + + "github.com/onsi/ginkgo" + "golang.org/x/oauth2/google" ) const ( @@ -44,7 +46,7 @@ const ( var _ = instrumentation.SIGDescribe("Stackdriver Monitoring", func() { ginkgo.BeforeEach(func() { - framework.SkipUnlessProviderIs("gce", "gke") + e2eskipper.SkipUnlessProviderIs("gce", "gke") }) f := framework.NewDefaultFramework("stackdriver-monitoring")