Merge pull request #1147 from dchen1107/restart

Introduce the simplest RestartPolicy and handling.
This commit is contained in:
Tim Hockin
2014-09-09 14:44:42 -07:00
9 changed files with 171 additions and 54 deletions

View File

@@ -52,7 +52,8 @@ func CreateValidPod(name, namespace string) kubelet.Pod {
Name: name,
Namespace: namespace,
Manifest: api.ContainerManifest{
Version: "v1beta1",
Version: "v1beta1",
RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
},
}
}

View File

@@ -105,8 +105,12 @@ func TestExtractFromHTTP(t *testing.T) {
manifests: api.ContainerManifest{Version: "v1beta1", ID: "foo"},
expected: CreatePodUpdate(kubelet.SET,
kubelet.Pod{
Name: "foo",
Manifest: api.ContainerManifest{Version: "v1beta1", ID: "foo"},
Name: "foo",
Manifest: api.ContainerManifest{
Version: "v1beta1",
ID: "foo",
RestartPolicy: api.RestartPolicy{Always: &api.RestartPolicyAlways{}},
},
}),
},
{