diff --git a/cmd/kubeadm/app/constants/constants.go b/cmd/kubeadm/app/constants/constants.go index 3eb0c020803..d89d813ac88 100644 --- a/cmd/kubeadm/app/constants/constants.go +++ b/cmd/kubeadm/app/constants/constants.go @@ -177,6 +177,8 @@ const ( PatchNodeTimeout = 2 * time.Minute // TLSBootstrapTimeout specifies how long kubeadm should wait for the kubelet to perform the TLS Bootstrap TLSBootstrapTimeout = 2 * time.Minute + // PrepullImagesInParallelTimeout specifies how long kubeadm should wait for prepulling images in parallel before timing out + PrepullImagesInParallelTimeout = 10 * time.Second // DefaultControlPlaneTimeout specifies the default control plane (actually API Server) timeout for use by kubeadm DefaultControlPlaneTimeout = 4 * time.Minute diff --git a/cmd/kubeadm/app/phases/upgrade/prepull_test.go b/cmd/kubeadm/app/phases/upgrade/prepull_test.go index f52d2f074b0..b7d574c81f2 100644 --- a/cmd/kubeadm/app/phases/upgrade/prepull_test.go +++ b/cmd/kubeadm/app/phases/upgrade/prepull_test.go @@ -116,25 +116,25 @@ func TestPrepullImagesInParallel(t *testing.T) { { name: "should error out; create failed", p: NewFailedCreatePrepuller(), - timeout: 10 * time.Second, + timeout: constants.PrepullImagesInParallelTimeout, expectedErr: true, }, { name: "should error out; timeout exceeded", p: NewForeverWaitPrepuller(), - timeout: 10 * time.Second, + timeout: constants.PrepullImagesInParallelTimeout, expectedErr: true, }, { name: "should error out; delete failed", p: NewFailedDeletePrepuller(), - timeout: 10 * time.Second, + timeout: constants.PrepullImagesInParallelTimeout, expectedErr: true, }, { name: "should work just fine", p: NewGoodPrepuller(), - timeout: 10 * time.Second, + timeout: constants.PrepullImagesInParallelTimeout, expectedErr: false, }, }