Skip to content

K
k3s
Commit f9cb6f9b authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #48890 from jpbetz/group-api-machinery-e2e-tests

Automatic merge from submit-queue Move api-machinery related e2e tests to a 'api-machinery' e2e test su… …bdirectory. **What this PR does / why we need it**: Moves all e2e tests belonging to sig-api-machinery into a dedicated `test/e2e/apimachinery ` directory and updates the tests to use `SigDescribe` to prepend `[sig-api-machinery]` to the testnames of all apimachinery owned tests. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
parents 23e60ac9 b7c1bb43
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 72 deletions
test/e2e/BUILD
View file @ f9cb6f9b
...@@ -19,10 +19,9 @@ go_test( ...@@ -19,10 +19,9 @@ go_test(
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library",
"//test/e2e/api:go_default_library", "//test/e2e/apimachinery:go_default_library",
"//test/e2e/autoscaling:go_default_library", "//test/e2e/autoscaling:go_default_library",
"//test/e2e/cluster-logging:go_default_library", "//test/e2e/cluster-logging:go_default_library",
"//test/e2e/extension:go_default_library",
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/e2e/kubectl:go_default_library", "//test/e2e/kubectl:go_default_library",
"//test/e2e/metrics:go_default_library", "//test/e2e/metrics:go_default_library",
...@@ -52,18 +51,15 @@ go_library( ...@@ -52,18 +51,15 @@ go_library(
"cadvisor.go", "cadvisor.go",
"certificates.go", "certificates.go",
"cluster_upgrade.go", "cluster_upgrade.go",
"custom_resource_definition.go",
"dashboard.go", "dashboard.go",
"dns.go", "dns.go",
"dns_common.go", "dns_common.go",
"dns_configmap.go", "dns_configmap.go",
"e2e.go", "e2e.go",
"etcd_failure.go",
"events.go", "events.go",
"example_cluster_dns.go", "example_cluster_dns.go",
"examples.go", "examples.go",
"firewall.go", "firewall.go",
"garbage_collector.go",
"generated_clientset.go", "generated_clientset.go",
"gke_local_ssd.go", "gke_local_ssd.go",
"gke_node_pools.go", "gke_node_pools.go",
...@@ -76,7 +72,6 @@ go_library( ...@@ -76,7 +72,6 @@ go_library(
"limit_range.go", "limit_range.go",
"logging_soak.go", "logging_soak.go",
"monitoring.go", "monitoring.go",
"namespace.go",
"network_partition.go", "network_partition.go",
"network_policy.go", "network_policy.go",
"networking.go", "networking.go",
...@@ -114,7 +109,6 @@ go_library( ...@@ -114,7 +109,6 @@ go_library(
"//pkg/cloudprovider:go_default_library", "//pkg/cloudprovider:go_default_library",
"//pkg/cloudprovider/providers/azure:go_default_library", "//pkg/cloudprovider/providers/azure:go_default_library",
"//pkg/cloudprovider/providers/gce:go_default_library", "//pkg/cloudprovider/providers/gce:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/controller/endpoint:go_default_library", "//pkg/controller/endpoint:go_default_library",
"//pkg/controller/node:go_default_library", "//pkg/controller/node:go_default_library",
"//pkg/kubelet/apis:go_default_library", "//pkg/kubelet/apis:go_default_library",
...@@ -134,7 +128,6 @@ go_library( ...@@ -134,7 +128,6 @@ go_library(
"//test/e2e/metrics:go_default_library", "//test/e2e/metrics:go_default_library",
"//test/e2e/upgrades:go_default_library", "//test/e2e/upgrades:go_default_library",
"//test/e2e/upgrades/apps:go_default_library", "//test/e2e/upgrades/apps:go_default_library",
"//test/e2e/workload:go_default_library",
"//test/e2e_federation:go_default_library", "//test/e2e_federation:go_default_library",
"//test/images/net/nat:go_default_library", "//test/images/net/nat:go_default_library",
"//test/utils:go_default_library", "//test/utils:go_default_library",
...@@ -156,9 +149,6 @@ go_library( ...@@ -156,9 +149,6 @@ go_library(
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library", "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/api/rbac/v1beta1:go_default_library", "//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
"//vendor/k8s.io/api/settings/v1alpha1:go_default_library", "//vendor/k8s.io/api/settings/v1alpha1:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/test/integration/testserver:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
...@@ -166,7 +156,6 @@ go_library( ...@@ -166,7 +156,6 @@ go_library(
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library", "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library", "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
...@@ -203,12 +192,11 @@ filegroup( ...@@ -203,12 +192,11 @@ filegroup(
name = "all-srcs", name = "all-srcs",
srcs = [ srcs = [
":package-srcs", ":package-srcs",
"//test/e2e/api:all-srcs", "//test/e2e/apimachinery:all-srcs",
"//test/e2e/autoscaling:all-srcs", "//test/e2e/autoscaling:all-srcs",
"//test/e2e/chaosmonkey:all-srcs", "//test/e2e/chaosmonkey:all-srcs",
"//test/e2e/cluster-logging:all-srcs", "//test/e2e/cluster-logging:all-srcs",
"//test/e2e/common:all-srcs", "//test/e2e/common:all-srcs",
"//test/e2e/extension:all-srcs",
"//test/e2e/framework:all-srcs", "//test/e2e/framework:all-srcs",
"//test/e2e/generated:all-srcs", "//test/e2e/generated:all-srcs",
"//test/e2e/kubectl:all-srcs", "//test/e2e/kubectl:all-srcs",
......
test/e2e/api/BUILD deleted 100644 → 0
View file @ 23e60ac9
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
go_library(
name = "go_default_library",
srcs = ["table_conversion.go"],
tags = ["automanaged"],
deps = [
"//pkg/printers:go_default_library",
"//test/e2e/framework:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
test/e2e/extension/BUILD → test/e2e/apimachinery/BUILD
View file @ f9cb6f9b
...@@ -9,18 +9,40 @@ load( ...@@ -9,18 +9,40 @@ load(
go_library( go_library(
name = "go_default_library", name = "go_default_library",
srcs = ["initializers.go"], srcs = [
"custom_resource_definition.go",
"etcd_failure.go",
"framework.go",
"garbage_collector.go",
"initializers.go",
"namespace.go",
"table_conversion.go",
],
tags = ["automanaged"], tags = ["automanaged"],
deps = [ deps = [
"//pkg/api/v1/pod:go_default_library",
"//pkg/client/clientset_generated/clientset:go_default_library", "//pkg/client/clientset_generated/clientset:go_default_library",
"//pkg/client/retry:go_default_library", "//pkg/client/retry:go_default_library",
"//pkg/controller:go_default_library",
"//pkg/printers:go_default_library",
"//test/e2e/framework:go_default_library", "//test/e2e/framework:go_default_library",
"//test/e2e/metrics:go_default_library",
"//test/e2e/workload:go_default_library",
"//test/utils:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library", "//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/gomega:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library", "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset:go_default_library",
"//vendor/k8s.io/apiextensions-apiserver/test/integration/testserver:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library", "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1alpha1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/intstr:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library", "//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
], ],
) )
......
test/e2e/custom_resource_definition.go → test/e2e/apimachinery/custom_resource_definition.go
View file @ f9cb6f9b
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e package apimachinery
import ( import (
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1" "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
...@@ -25,7 +25,7 @@ import ( ...@@ -25,7 +25,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
) )
var _ = Describe("CustomResourceDefinition resources", func() { var _ = SIGDescribe("CustomResourceDefinition resources", func() {
f := framework.NewDefaultFramework("custom-resource-definition") f := framework.NewDefaultFramework("custom-resource-definition")
......
test/e2e/etcd_failure.go → test/e2e/apimachinery/etcd_failure.go
View file @ f9cb6f9b
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e package apimachinery
import ( import (
"time" "time"
...@@ -31,7 +31,7 @@ import ( ...@@ -31,7 +31,7 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
var _ = framework.KubeDescribe("Etcd failure [Disruptive]", func() { var _ = SIGDescribe("Etcd failure [Disruptive]", func() {
f := framework.NewDefaultFramework("etcd-failure") f := framework.NewDefaultFramework("etcd-failure")
......
test/e2e/apimachinery/framework.go 0 → 100644
View file @ f9cb6f9b
/*
Copyright 2017 The Kubernetes Authors.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package apimachinery
import "github.com/onsi/ginkgo"
func SIGDescribe(text string, body func()) bool {
return ginkgo.Describe("[sig-api-machinery] "+text, body)
}
test/e2e/garbage_collector.go → test/e2e/apimachinery/garbage_collector.go
View file @ f9cb6f9b
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e package apimachinery
import ( import (
"fmt" "fmt"
...@@ -208,7 +208,7 @@ func gatherMetrics(f *framework.Framework) { ...@@ -208,7 +208,7 @@ func gatherMetrics(f *framework.Framework) {
} }
} }
var _ = framework.KubeDescribe("Garbage collector", func() { var _ = SIGDescribe("Garbage collector", func() {
f := framework.NewDefaultFramework("gc") f := framework.NewDefaultFramework("gc")
It("should delete pods created by rc when not orphaning", func() { It("should delete pods created by rc when not orphaning", func() {
clientSet := f.ClientSet clientSet := f.ClientSet
......
test/e2e/extension/initializers.go → test/e2e/apimachinery/initializers.go
View file @ f9cb6f9b
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package extension package apimachinery
import ( import (
"fmt" "fmt"
...@@ -34,7 +34,7 @@ import ( ...@@ -34,7 +34,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
) )
var _ = framework.KubeDescribe("Initializers", func() { var _ = SIGDescribe("Initializers", func() {
f := framework.NewDefaultFramework("initializers") f := framework.NewDefaultFramework("initializers")
// TODO: Add failure traps once we have JustAfterEach // TODO: Add failure traps once we have JustAfterEach
...@@ -150,7 +150,7 @@ var _ = framework.KubeDescribe("Initializers", func() { ...@@ -150,7 +150,7 @@ var _ = framework.KubeDescribe("Initializers", func() {
ch := make(chan struct{}) ch := make(chan struct{})
go func() { go func() {
defer close(ch) defer close(ch)
_, err := c.Core().Pods(ns).Create(newPod(podName)) _, err := c.Core().Pods(ns).Create(newInitPod(podName))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
}() }()
...@@ -197,7 +197,7 @@ var _ = framework.KubeDescribe("Initializers", func() { ...@@ -197,7 +197,7 @@ var _ = framework.KubeDescribe("Initializers", func() {
// bypass initialization for mirror pods // bypass initialization for mirror pods
By("Creating a mirror pod that bypasses initialization") By("Creating a mirror pod that bypasses initialization")
podName = "mirror-pod" podName = "mirror-pod"
pod = newPod(podName) pod = newInitPod(podName)
pod.Annotations = map[string]string{ pod.Annotations = map[string]string{
v1.MirrorPodAnnotationKey: "true", v1.MirrorPodAnnotationKey: "true",
} }
...@@ -210,14 +210,14 @@ var _ = framework.KubeDescribe("Initializers", func() { ...@@ -210,14 +210,14 @@ var _ = framework.KubeDescribe("Initializers", func() {
}) })
func newUninitializedPod(podName string) *v1.Pod { func newUninitializedPod(podName string) *v1.Pod {
pod := newPod(podName) pod := newInitPod(podName)
pod.Initializers = &metav1.Initializers{ pod.Initializers = &metav1.Initializers{
Pending: []metav1.Initializer{{Name: "Test"}}, Pending: []metav1.Initializer{{Name: "Test"}},
} }
return pod return pod
} }
func newPod(podName string) *v1.Pod { func newInitPod(podName string) *v1.Pod {
containerName := fmt.Sprintf("%s-container", podName) containerName := fmt.Sprintf("%s-container", podName)
port := 8080 port := 8080
pod := &v1.Pod{ pod := &v1.Pod{
......
test/e2e/namespace.go → test/e2e/apimachinery/namespace.go
View file @ f9cb6f9b
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package e2e package apimachinery
import ( import (
"fmt" "fmt"
...@@ -257,7 +257,7 @@ func ensureServicesAreRemovedWhenNamespaceIsDeleted(f *framework.Framework) { ...@@ -257,7 +257,7 @@ func ensureServicesAreRemovedWhenNamespaceIsDeleted(f *framework.Framework) {
// that each have a variable amount of content in the associated Namespace. // that each have a variable amount of content in the associated Namespace.
// When run in [Serial] this test appears to delete Namespace objects at a // When run in [Serial] this test appears to delete Namespace objects at a
// rate of approximately 1 per second. // rate of approximately 1 per second.
var _ = framework.KubeDescribe("Namespaces [Serial]", func() { var _ = SIGDescribe("Namespaces [Serial]", func() {
f := framework.NewDefaultFramework("namespaces") f := framework.NewDefaultFramework("namespaces")
......
test/e2e/api/table_conversion.go → test/e2e/apimachinery/table_conversion.go
View file @ f9cb6f9b
...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and ...@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
*/ */
package extension package apimachinery
import ( import (
"bytes" "bytes"
...@@ -32,7 +32,7 @@ import ( ...@@ -32,7 +32,7 @@ import (
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
) )
var _ = framework.KubeDescribe("Servers with support for Table transformation", func() { var _ = SIGDescribe("Servers with support for Table transformation", func() {
f := framework.NewDefaultFramework("tables") f := framework.NewDefaultFramework("tables")
It("should return pod details", func() { It("should return pod details", func() {
...@@ -42,7 +42,7 @@ var _ = framework.KubeDescribe("Servers with support for Table transformation", ...@@ -42,7 +42,7 @@ var _ = framework.KubeDescribe("Servers with support for Table transformation",
podName := "pod-1" podName := "pod-1"
framework.Logf("Creating pod %s", podName) framework.Logf("Creating pod %s", podName)
_, err := c.Core().Pods(ns).Create(newPod(podName)) _, err := c.Core().Pods(ns).Create(newTablePod(podName))
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
table := &metav1alpha1.Table{} table := &metav1alpha1.Table{}
...@@ -99,7 +99,7 @@ func printTable(table *metav1alpha1.Table) string { ...@@ -99,7 +99,7 @@ func printTable(table *metav1alpha1.Table) string {
return buf.String() return buf.String()
} }
func newPod(podName string) *v1.Pod { func newTablePod(podName string) *v1.Pod {
containerName := fmt.Sprintf("%s-container", podName) containerName := fmt.Sprintf("%s-container", podName)
port := 8080 port := 8080
pod := &v1.Pod{ pod := &v1.Pod{
......
test/e2e/e2e_test.go
View file @ f9cb6f9b
...@@ -19,10 +19,9 @@ package e2e ...@@ -19,10 +19,9 @@ package e2e
import ( import (
"testing" "testing"
_ "k8s.io/kubernetes/test/e2e/api" _ "k8s.io/kubernetes/test/e2e/apimachinery"
_ "k8s.io/kubernetes/test/e2e/autoscaling" _ "k8s.io/kubernetes/test/e2e/autoscaling"
_ "k8s.io/kubernetes/test/e2e/cluster-logging" _ "k8s.io/kubernetes/test/e2e/cluster-logging"
_ "k8s.io/kubernetes/test/e2e/extension"
"k8s.io/kubernetes/test/e2e/framework" "k8s.io/kubernetes/test/e2e/framework"
_ "k8s.io/kubernetes/test/e2e/kubectl" _ "k8s.io/kubernetes/test/e2e/kubectl"
_ "k8s.io/kubernetes/test/e2e/scalability" _ "k8s.io/kubernetes/test/e2e/scalability"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment