Commit 3c5b050d authored by Michael Taufen's avatar Michael Taufen

move sig-node related e2e tests to node subdir

parent 6fbc554c
...@@ -815,6 +815,7 @@ test/e2e/lifecycle ...@@ -815,6 +815,7 @@ test/e2e/lifecycle
test/e2e/lifecycle/bootstrap test/e2e/lifecycle/bootstrap
test/e2e/metrics test/e2e/metrics
test/e2e/network test/e2e/network
test/e2e/node
test/e2e/scalability test/e2e/scalability
test/e2e/scheduling test/e2e/scheduling
test/e2e/storage test/e2e/storage
......
...@@ -49,8 +49,6 @@ go_test( ...@@ -49,8 +49,6 @@ go_test(
go_library( go_library(
name = "go_default_library", name = "go_default_library",
srcs = [ srcs = [
"apparmor.go",
"audit.go",
"certificates.go", "certificates.go",
"dashboard.go", "dashboard.go",
"e2e.go", "e2e.go",
...@@ -61,8 +59,6 @@ go_library( ...@@ -61,8 +59,6 @@ go_library(
"gke_local_ssd.go", "gke_local_ssd.go",
"gke_node_pools.go", "gke_node_pools.go",
"ingress.go", "ingress.go",
"kubelet.go",
"kubelet_perf.go",
"limit_range.go", "limit_range.go",
"network_partition.go", "network_partition.go",
"no-snat.go", "no-snat.go",
...@@ -71,7 +67,6 @@ go_library( ...@@ -71,7 +67,6 @@ go_library(
"pods.go", "pods.go",
"pre_stop.go", "pre_stop.go",
"resource_quota.go", "resource_quota.go",
"security_context.go",
"service_accounts.go", "service_accounts.go",
"service_latency.go", "service_latency.go",
"serviceloadbalancers.go", "serviceloadbalancers.go",
...@@ -87,7 +82,6 @@ go_library( ...@@ -87,7 +82,6 @@ go_library(
"//pkg/cloudprovider/providers/gce:go_default_library", "//pkg/cloudprovider/providers/gce: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",
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/quota/evaluator/core:go_default_library", "//pkg/quota/evaluator/core:go_default_library",
"//pkg/util/logs:go_default_library", "//pkg/util/logs:go_default_library",
"//pkg/util/version:go_default_library", "//pkg/util/version:go_default_library",
...@@ -169,6 +163,7 @@ filegroup( ...@@ -169,6 +163,7 @@ filegroup(
"//test/e2e/manifest:all-srcs", "//test/e2e/manifest:all-srcs",
"//test/e2e/metrics:all-srcs", "//test/e2e/metrics:all-srcs",
"//test/e2e/network:all-srcs", "//test/e2e/network:all-srcs",
"//test/e2e/node:all-srcs",
"//test/e2e/perftype:all-srcs", "//test/e2e/perftype:all-srcs",
"//test/e2e/scalability:all-srcs", "//test/e2e/scalability:all-srcs",
"//test/e2e/scheduling:all-srcs", "//test/e2e/scheduling:all-srcs",
......
package(default_visibility = ["//visibility:public"])
licenses(["notice"])
load(
"@io_bazel_rules_go//go:def.bzl",
"go_library",
)
go_library(
name = "go_default_library",
srcs = [
"apparmor.go",
"audit.go",
"kubelet.go",
"kubelet_perf.go",
"nodeoutofdisk.go",
"security_context.go",
"sig.go",
],
tags = ["automanaged"],
deps = [
"//pkg/api/testapi:go_default_library",
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//test/e2e/common:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/utils:go_default_library",
"//vendor/github.com/google/cadvisor/info/v1: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/resource:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/fields:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/sets:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/uuid:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/wait:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
],
)
filegroup(
name = "package-srcs",
srcs = glob(["**"]),
tags = ["automanaged"],
visibility = ["//visibility:private"],
)
filegroup(
name = "all-srcs",
srcs = [":package-srcs"],
tags = ["automanaged"],
)
approvers:
- Random-Liu
- dchen1107
- derekwaynecarr
- tallclair
- vishh
- yujuhong
reviewers:
- sig-node-reviewers
...@@ -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 node
import ( import (
"k8s.io/kubernetes/test/e2e/common" "k8s.io/kubernetes/test/e2e/common"
...@@ -23,7 +23,7 @@ import ( ...@@ -23,7 +23,7 @@ import (
. "github.com/onsi/ginkgo" . "github.com/onsi/ginkgo"
) )
var _ = framework.KubeDescribe("AppArmor", func() { var _ = SIGDescribe("AppArmor", func() {
f := framework.NewDefaultFramework("apparmor") f := framework.NewDefaultFramework("apparmor")
Context("load AppArmor profiles", func() { Context("load AppArmor profiles", func() {
......
...@@ -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 node
import ( import (
"bufio" "bufio"
...@@ -29,7 +29,7 @@ import ( ...@@ -29,7 +29,7 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
var _ = framework.KubeDescribe("Advanced Audit [Feature:Audit]", func() { var _ = SIGDescribe("Advanced Audit [Feature:Audit]", func() {
f := framework.NewDefaultFramework("audit") f := framework.NewDefaultFramework("audit")
It("should audit API calls", func() { It("should audit API calls", func() {
......
...@@ -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 node
import ( import (
"fmt" "fmt"
...@@ -270,7 +270,7 @@ func checkPodCleanup(c clientset.Interface, pod *v1.Pod, expectClean bool) { ...@@ -270,7 +270,7 @@ func checkPodCleanup(c clientset.Interface, pod *v1.Pod, expectClean bool) {
} }
} }
var _ = framework.KubeDescribe("kubelet", func() { var _ = SIGDescribe("kubelet", func() {
var ( var (
c clientset.Interface c clientset.Interface
ns string ns string
...@@ -282,7 +282,7 @@ var _ = framework.KubeDescribe("kubelet", func() { ...@@ -282,7 +282,7 @@ var _ = framework.KubeDescribe("kubelet", func() {
ns = f.Namespace.Name ns = f.Namespace.Name
}) })
framework.KubeDescribe("Clean up pods on node", func() { SIGDescribe("Clean up pods on node", func() {
var ( var (
numNodes int numNodes int
nodeNames sets.String nodeNames sets.String
...@@ -383,7 +383,7 @@ var _ = framework.KubeDescribe("kubelet", func() { ...@@ -383,7 +383,7 @@ var _ = framework.KubeDescribe("kubelet", func() {
}) })
// Test host cleanup when disrupting the volume environment. // Test host cleanup when disrupting the volume environment.
framework.KubeDescribe("host cleanup with volume mounts [sig-storage][HostCleanup][Flaky]", func() { SIGDescribe("host cleanup with volume mounts [sig-storage][HostCleanup][Flaky]", func() {
type hostCleanupTest struct { type hostCleanupTest struct {
itDescr string itDescr string
......
...@@ -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 node
import ( import (
"fmt" "fmt"
...@@ -191,7 +191,7 @@ func verifyCPULimits(expected framework.ContainersCPUSummary, actual framework.N ...@@ -191,7 +191,7 @@ func verifyCPULimits(expected framework.ContainersCPUSummary, actual framework.N
} }
// Slow by design (1 hour) // Slow by design (1 hour)
var _ = framework.KubeDescribe("Kubelet [Serial] [Slow]", func() { var _ = SIGDescribe("Kubelet [Serial] [Slow]", func() {
var nodeNames sets.String var nodeNames sets.String
f := framework.NewDefaultFramework("kubelet-perf") f := framework.NewDefaultFramework("kubelet-perf")
var om *framework.RuntimeOperationMonitor var om *framework.RuntimeOperationMonitor
...@@ -219,7 +219,7 @@ var _ = framework.KubeDescribe("Kubelet [Serial] [Slow]", func() { ...@@ -219,7 +219,7 @@ var _ = framework.KubeDescribe("Kubelet [Serial] [Slow]", func() {
result := om.GetLatestRuntimeOperationErrorRate() result := om.GetLatestRuntimeOperationErrorRate()
framework.Logf("runtime operation error metrics:\n%s", framework.FormatRuntimeOperationErrorRate(result)) framework.Logf("runtime operation error metrics:\n%s", framework.FormatRuntimeOperationErrorRate(result))
}) })
framework.KubeDescribe("regular resource usage tracking", func() { SIGDescribe("regular resource usage tracking", func() {
// We assume that the scheduler will make reasonable scheduling choices // We assume that the scheduler will make reasonable scheduling choices
// and assign ~N pods on the node. // and assign ~N pods on the node.
// Although we want to track N pods per node, there are N + add-on pods // Although we want to track N pods per node, there are N + add-on pods
...@@ -271,7 +271,7 @@ var _ = framework.KubeDescribe("Kubelet [Serial] [Slow]", func() { ...@@ -271,7 +271,7 @@ var _ = framework.KubeDescribe("Kubelet [Serial] [Slow]", func() {
}) })
} }
}) })
framework.KubeDescribe("experimental resource usage tracking [Feature:ExperimentalResourceUsageTracking]", func() { SIGDescribe("experimental resource usage tracking [Feature:ExperimentalResourceUsageTracking]", func() {
density := []int{100} density := []int{100}
for i := range density { for i := range density {
podsPerNode := density[i] podsPerNode := density[i]
......
...@@ -20,7 +20,7 @@ limitations under the License. ...@@ -20,7 +20,7 @@ limitations under the License.
* so they are skipped by default. * so they are skipped by default.
*/ */
package e2e package node
import ( import (
"fmt" "fmt"
...@@ -59,7 +59,7 @@ func scTestPod(hostIPC bool, hostPID bool) *v1.Pod { ...@@ -59,7 +59,7 @@ func scTestPod(hostIPC bool, hostPID bool) *v1.Pod {
return pod return pod
} }
var _ = framework.KubeDescribe("Security Context [Feature:SecurityContext]", func() { var _ = SIGDescribe("Security Context [Feature:SecurityContext]", func() {
f := framework.NewDefaultFramework("security-context") f := framework.NewDefaultFramework("security-context")
It("should support pod.Spec.SecurityContext.SupplementalGroups", func() { It("should support pod.Spec.SecurityContext.SupplementalGroups", func() {
......
/*
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 node
import "k8s.io/kubernetes/test/e2e/framework"
func SIGDescribe(text string, body func()) bool {
return framework.KubeDescribe("[sig-node] "+text, body)
}
...@@ -19,6 +19,7 @@ package e2e ...@@ -19,6 +19,7 @@ package e2e
import ( import (
"fmt" "fmt"
"net/http" "net/http"
"time"
"k8s.io/api/core/v1" "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
...@@ -121,7 +122,7 @@ func (h *haproxyControllerTester) start(namespace string) (err error) { ...@@ -121,7 +122,7 @@ func (h *haproxyControllerTester) start(namespace string) (err error) {
// Find the external addresses of the nodes the pods are running on. // Find the external addresses of the nodes the pods are running on.
for _, p := range pods.Items { for _, p := range pods.Items {
wait.Poll(pollInterval, framework.ServiceRespondingTimeout, func() (bool, error) { wait.Poll(1*time.Second, framework.ServiceRespondingTimeout, func() (bool, error) {
address, err := framework.GetHostExternalAddress(h.client, &p) address, err := framework.GetHostExternalAddress(h.client, &p)
if err != nil { if err != nil {
framework.Logf("%v", err) framework.Logf("%v", err)
...@@ -202,7 +203,7 @@ func (s *ingManager) start(namespace string) (err error) { ...@@ -202,7 +203,7 @@ func (s *ingManager) start(namespace string) (err error) {
func (s *ingManager) test(path string) error { func (s *ingManager) test(path string) error {
url := fmt.Sprintf("%v/hostName", path) url := fmt.Sprintf("%v/hostName", path)
httpClient := &http.Client{} httpClient := &http.Client{}
return wait.Poll(pollInterval, framework.ServiceRespondingTimeout, func() (bool, error) { return wait.Poll(1*time.Second, framework.ServiceRespondingTimeout, func() (bool, error) {
body, err := framework.SimpleGET(httpClient, url, "") body, err := framework.SimpleGET(httpClient, url, "")
if err != nil { if err != nil {
framework.Logf("%v\n%v\n%v", url, body, err) framework.Logf("%v\n%v\n%v", url, body, err)
......
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