diff --git a/test/e2e/framework/BUILD b/test/e2e/framework/BUILD index d46e7c3b962..4ee13ca8939 100644 --- a/test/e2e/framework/BUILD +++ b/test/e2e/framework/BUILD @@ -28,8 +28,6 @@ go_library( "//pkg/controller:go_default_library", "//pkg/kubelet/apis/config: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/core/v1:go_default_library", "//staging/src/k8s.io/api/policy/v1beta1:go_default_library", diff --git a/test/e2e/framework/pods.go b/test/e2e/framework/pods.go index 32a84c41678..66adeddc515 100644 --- a/test/e2e/framework/pods.go +++ b/test/e2e/framework/pods.go @@ -32,8 +32,6 @@ import ( "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" "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/gomega" @@ -42,8 +40,22 @@ import ( e2epod "k8s.io/kubernetes/test/e2e/framework/pod" ) -// DefaultPodDeletionTimeout is the default timeout for deleting pod -const DefaultPodDeletionTimeout = 3 * time.Minute +const ( + // 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 // 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 { switch e.Reason { - case events.KillingContainer, events.FailedToCreateContainer, sysctl.ForbiddenReason: + case killingContainer, failedToCreateContainer, forbiddenReason: ev = &e return true, nil - case events.StartedContainer: + case startedContainer: return true, nil default: // ignore all other errors