github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #54279 from guangxuli/fix-sig-node-e2e 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Migrate pod relevant e2e tests to sig node

**What this PR does / why we need it**:

Migrate pod relevant e2e tests to sig-node. 

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #
Ref Umbrella issue #49161

**Special notes for your reviewer**:

**Release note**:
```release-note
none
```
pull/6/head
Kubernetes Submit Queue 2017-11-07 06:54:20 -08:00 committed by GitHub
parent a00340afb3 7c7392014d
commit d07bc1485c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
test/conformance/testdata/conformance.txt vendored
View File

@ -108,7 +108,6 @@ test/e2e/common/secrets_volume.go: "should be consumable from pods in volume wit
test/e2e/common/secrets_volume.go: "should be consumable from pods in volume with mappings and Item Mode set "
test/e2e/common/secrets_volume.go: "should be consumable in multiple volumes in a pod "
test/e2e/common/secrets_volume.go: "optional updates should be reflected in volume "
test/e2e/events.go: "should be sent by kubelets and the scheduler about pods scheduling and running "
test/e2e/kubectl/kubectl.go: "should create and stop a replication controller "
test/e2e/kubectl/kubectl.go: "should scale a replication controller "
test/e2e/kubectl/kubectl.go: "should do a rolling update of a replication controller "
@ -142,9 +141,10 @@ test/e2e/network/service.go: "should provide secure master service "
test/e2e/network/service.go: "should serve a basic endpoint from pods "
test/e2e/network/service.go: "should serve multiport endpoints from pods "
test/e2e/network/service_latency.go: "should not be very high "
test/e2e/pods.go: "should be submitted and removed [Flaky]"
test/e2e/pods.go: "should be submitted and removed "
test/e2e/pre_stop.go: "should call prestop when killing a pod "
test/e2e/node/events.go: "should be sent by kubelets and the scheduler about pods scheduling and running "
test/e2e/node/pods.go: "should be submitted and removed [Flaky]"
test/e2e/node/pods.go: "should be submitted and removed "
test/e2e/node/pre_stop.go: "should call prestop when killing a pod "
test/e2e/scheduling/predicates.go: "validates resource limits of pods that are allowed to run "
test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if not matching "
test/e2e/scheduling/predicates.go: "validates that NodeSelector is respected if matching "

9
test/e2e/BUILD
View File

@ -38,14 +38,9 @@ go_library(
name = "go_default_library",
srcs = [
"e2e.go",
"events.go",
"examples.go",
"gke_local_ssd.go",
"gke_node_pools.go",
"pod_gc.go",
"pods.go",
"pre_stop.go",
"ssh.go",
],
importpath = "k8s.io/kubernetes/test/e2e",
deps = [
@ -62,7 +57,6 @@ go_library(
"//test/e2e/generated:go_default_library",
"//test/e2e/manifest:go_default_library",
"//test/utils:go_default_library",
"//test/utils/image:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/onsi/ginkgo:go_default_library",
"//vendor/github.com/onsi/ginkgo/config:go_default_library",
@ -70,15 +64,12 @@ go_library(
"//vendor/github.com/onsi/gomega:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/rbac/v1beta1: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/labels:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/util/runtime: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/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/apiserver/pkg/authentication/serviceaccount:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
],

10
test/e2e/node/BUILD
View File

@ -4,10 +4,15 @@ go_library(
name = "go_default_library",
srcs = [
"apparmor.go",
"events.go",
"framework.go",
"kubelet.go",
"kubelet_perf.go",
"pod_gc.go",
"pods.go",
"pre_stop.go",
"security_context.go",
"ssh.go",
],
importpath = "k8s.io/kubernetes/test/e2e/node",
visibility = ["//visibility:public"],
@ -17,13 +22,18 @@ go_library(
"//test/e2e/common:go_default_library",
"//test/e2e/framework:go_default_library",
"//test/utils:go_default_library",
"//test/utils/image: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/labels: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/apimachinery/pkg/watch:go_default_library",
"//vendor/k8s.io/client-go/kubernetes:go_default_library",
],
)

4
test/e2e/events.go → test/e2e/node/events.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e
package node
import (
"fmt"
@ -33,7 +33,7 @@ import (
. "github.com/onsi/gomega"
)
var _ = framework.KubeDescribe("Events", func() {
var _ = SIGDescribe("Events", func() {
f := framework.NewDefaultFramework("events")
framework.ConformanceIt("should be sent by kubelets and the scheduler about pods scheduling and running ", func() {

4
test/e2e/pod_gc.go → test/e2e/node/pod_gc.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e
package node
import (
"fmt"
@ -32,7 +32,7 @@ import (
// This test requires that --terminated-pod-gc-threshold=100 be set on the controller manager
//
// Slow by design (7 min)
var _ = framework.KubeDescribe("Pod garbage collector [Feature:PodGarbageCollector] [Slow]", func() {
var _ = SIGDescribe("Pod garbage collector [Feature:PodGarbageCollector] [Slow]", func() {
f := framework.NewDefaultFramework("pod-garbage-collector")
It("should handle the creation of 1000 pods", func() {
var count int

4
test/e2e/pods.go → test/e2e/node/pods.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e
package node
import (
"crypto/tls"
@ -38,7 +38,7 @@ import (
imageutils "k8s.io/kubernetes/test/utils/image"
)
var _ = framework.KubeDescribe("Pods Extended", func() {
var _ = SIGDescribe("Pods Extended", func() {
f := framework.NewDefaultFramework("pods")
framework.KubeDescribe("Delete Grace Period", func() {

4
test/e2e/pre_stop.go → test/e2e/node/pre_stop.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e
package node
import (
"context"
@ -158,7 +158,7 @@ func testPreStop(c clientset.Interface, ns string) {
framework.ExpectNoError(err, "validating pre-stop.")
}
var _ = framework.KubeDescribe("PreStop", func() {
var _ = SIGDescribe("PreStop", func() {
f := framework.NewDefaultFramework("prestop")
/*

4
test/e2e/ssh.go → test/e2e/node/ssh.go
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
package e2e
package node
import (
"fmt"
@ -27,7 +27,7 @@ import (
const maxNodes = 100
var _ = framework.KubeDescribe("SSH", func() {
var _ = SIGDescribe("SSH", func() {
f := framework.NewDefaultFramework("ssh")