diff --git a/pkg/kubelet/config/common.go b/pkg/kubelet/config/common.go index 28aad3e0ebd..59cd149be3e 100644 --- a/pkg/kubelet/config/common.go +++ b/pkg/kubelet/config/common.go @@ -70,6 +70,9 @@ func applyDefaults(pod *api.Pod, source string, isFile bool, nodeName string) er } // The generated UID is the hash of the file. pod.Annotations[kubetypes.ConfigHashAnnotationKey] = string(pod.UID) + + // Set the default status to pending. + pod.Status.Phase = api.PodPending return nil } diff --git a/pkg/kubelet/config/file_test.go b/pkg/kubelet/config/file_test.go index be30c035a88..268985b2506 100644 --- a/pkg/kubelet/config/file_test.go +++ b/pkg/kubelet/config/file_test.go @@ -93,6 +93,9 @@ func TestReadPodsFromFile(t *testing.T) { Containers: []api.Container{{Name: "image", Image: "test/image", SecurityContext: securitycontext.ValidSecurityContextWithContainerDefaults()}}, SecurityContext: &api.PodSecurityContext{}, }, + Status: api.PodStatus{ + Phase: api.PodPending, + }, }, expected: CreatePodUpdate(kubetypes.SET, kubetypes.FileSource, &api.Pod{ ObjectMeta: api.ObjectMeta{ @@ -115,6 +118,9 @@ func TestReadPodsFromFile(t *testing.T) { SecurityContext: securitycontext.ValidSecurityContextWithContainerDefaults()}}, SecurityContext: &api.PodSecurityContext{}, }, + Status: api.PodStatus{ + Phase: api.PodPending, + }, }), }, } diff --git a/pkg/kubelet/config/http_test.go b/pkg/kubelet/config/http_test.go index 4eb1d403c0e..aa63f248775 100644 --- a/pkg/kubelet/config/http_test.go +++ b/pkg/kubelet/config/http_test.go @@ -147,6 +147,9 @@ func TestExtractPodsFromHTTP(t *testing.T) { Containers: []api.Container{{Name: "1", Image: "foo", ImagePullPolicy: api.PullAlways}}, SecurityContext: &api.PodSecurityContext{}, }, + Status: api.PodStatus{ + Phase: api.PodPending, + }, }, expected: CreatePodUpdate(kubetypes.SET, kubetypes.HTTPSource, @@ -172,6 +175,9 @@ func TestExtractPodsFromHTTP(t *testing.T) { ImagePullPolicy: "Always", }}, }, + Status: api.PodStatus{ + Phase: api.PodPending, + }, }), }, { @@ -192,6 +198,9 @@ func TestExtractPodsFromHTTP(t *testing.T) { Containers: []api.Container{{Name: "1", Image: "foo", ImagePullPolicy: api.PullAlways}}, SecurityContext: &api.PodSecurityContext{}, }, + Status: api.PodStatus{ + Phase: api.PodPending, + }, }, { ObjectMeta: api.ObjectMeta{ @@ -203,6 +212,9 @@ func TestExtractPodsFromHTTP(t *testing.T) { Containers: []api.Container{{Name: "2", Image: "bar:bartag", ImagePullPolicy: ""}}, SecurityContext: &api.PodSecurityContext{}, }, + Status: api.PodStatus{ + Phase: api.PodPending, + }, }, }, }, @@ -230,6 +242,9 @@ func TestExtractPodsFromHTTP(t *testing.T) { ImagePullPolicy: "Always", }}, }, + Status: api.PodStatus{ + Phase: api.PodPending, + }, }, &api.Pod{ ObjectMeta: api.ObjectMeta{ @@ -253,6 +268,9 @@ func TestExtractPodsFromHTTP(t *testing.T) { ImagePullPolicy: "IfNotPresent", }}, }, + Status: api.PodStatus{ + Phase: api.PodPending, + }, }), }, }