Moving image pulling errors under kubelet/images

2016-07-19 15:42:21 -07:00
parent 7500d706ad
commit ee4822e476
9 changed files with 45 additions and 35 deletions
--- a/test/e2e_node/runtime_conformance_test.go
+++ b/test/e2e_node/runtime_conformance_test.go
@@ -22,7 +22,7 @@ import (
 	"time"

 	"k8s.io/kubernetes/pkg/api"
-	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
+	"k8s.io/kubernetes/pkg/kubelet/images"
 	"k8s.io/kubernetes/pkg/util"
 	"k8s.io/kubernetes/test/e2e/framework"

@@ -272,8 +272,8 @@ while true; do sleep 1; done
 						}
 						if testCase.waiting && status.State.Waiting != nil {
 							reason := status.State.Waiting.Reason
-							return reason == kubecontainer.ErrImagePull.Error() ||
-								reason == kubecontainer.ErrImagePullBackOff.Error(), nil
+							return reason == images.ErrImagePull.Error() ||
+								reason == images.ErrImagePullBackOff.Error(), nil

 						}
 						return false, nil