github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-04 10:47:25 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89213 from tanjunchen/cleanup20200318-003

Browse Source 
e2e/framework : pods.go remove direct imports to k8s.io/kubernetes/pkg/
This commit is contained in:
Kubernetes Prow Robot
2020-03-28 11:27:54 -07:00
committed by GitHub
parent a75ee745fb 27e133afe2
commit e03c7756c7
2 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/e2e/framework/BUILD
View File

@@ -28,8 +28,6 @@ go_library(
"//pkg/controller:go_default_library", "//pkg/controller:go_default_library",
"//pkg/kubelet/apis/config:go_default_library", "//pkg/kubelet/apis/config:go_default_library",
"//pkg/kubelet/apis/stats/v1alpha1:go_default_library", "//pkg/kubelet/apis/stats/v1alpha1:go_default_library",
"//pkg/kubelet/events:go_default_library",
"//pkg/kubelet/sysctl:go_default_library",
"//staging/src/k8s.io/api/apps/v1:go_default_library", "//staging/src/k8s.io/api/apps/v1:go_default_library",
"//staging/src/k8s.io/api/core/v1:go_default_library", "//staging/src/k8s.io/api/core/v1:go_default_library",
"//staging/src/k8s.io/api/policy/v1beta1:go_default_library", "//staging/src/k8s.io/api/policy/v1beta1:go_default_library",

24
test/e2e/framework/pods.go
View File

@@ -32,8 +32,6 @@ import (
"k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/kubernetes/scheme"
v1core "k8s.io/client-go/kubernetes/typed/core/v1" v1core "k8s.io/client-go/kubernetes/typed/core/v1"
"k8s.io/kubectl/pkg/util/podutils" "k8s.io/kubectl/pkg/util/podutils"
"k8s.io/kubernetes/pkg/kubelet/events"
"k8s.io/kubernetes/pkg/kubelet/sysctl"
"github.com/onsi/ginkgo" "github.com/onsi/ginkgo"
"github.com/onsi/gomega" "github.com/onsi/gomega"
@@ -42,8 +40,22 @@ import (
e2epod "k8s.io/kubernetes/test/e2e/framework/pod" e2epod "k8s.io/kubernetes/test/e2e/framework/pod"
) )
// DefaultPodDeletionTimeout is the default timeout for deleting pod const (
const DefaultPodDeletionTimeout = 3 * time.Minute // DefaultPodDeletionTimeout is the default timeout for deleting pod
DefaultPodDeletionTimeout = 3 * time.Minute
// the status of container event, copied from k8s.io/kubernetes/pkg/kubelet/events
killingContainer = "Killing"
// the status of container event, copied from k8s.io/kubernetes/pkg/kubelet/events
failedToCreateContainer = "Failed"
// the status of container event, copied from k8s.io/kubernetes/pkg/kubelet/events
startedContainer = "Started"
// it is copied from k8s.io/kubernetes/pkg/kubelet/sysctl
forbiddenReason = "SysctlForbidden"
)
// ImageWhiteList is the images used in the current test suite. It should be initialized in test suite and // ImageWhiteList is the images used in the current test suite. It should be initialized in test suite and
// the images in the white list should be pre-pulled in the test suite. Currently, this is only used by // the images in the white list should be pre-pulled in the test suite. Currently, this is only used by
@@ -227,10 +239,10 @@ func (c *PodClient) WaitForErrorEventOrSuccess(pod *v1.Pod) (*v1.Event, error) {
} }
for _, e := range evnts.Items { for _, e := range evnts.Items {
switch e.Reason { switch e.Reason {
case events.KillingContainer, events.FailedToCreateContainer, sysctl.ForbiddenReason: case killingContainer, failedToCreateContainer, forbiddenReason:
ev = &e ev = &e
return true, nil return true, nil
case events.StartedContainer: case startedContainer:
return true, nil return true, nil
default: default:
// ignore all other errors // ignore all other errors