github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-13 11:25:19 +00:00
Code Issues Projects Releases Wiki Activity

Removed PodStatus.Host

Browse Source 
Fixes #6165
This commit is contained in:
Piotr Szczesniak
2015-04-02 14:52:03 +02:00
parent 860257e01f
commit 5c6439d449
31 changed files with 149 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
pkg/kubelet/kubelet_test.go
View File

@@ -2169,22 +2169,20 @@ func failedState(cName string) api.ContainerStatus {
func TestPodPhaseWithRestartAlways(t *testing.T) {
desiredState := api.PodSpec{
Host: "machine",
Containers: []api.Container{
{Name: "containerA"},
{Name: "containerB"},
},
RestartPolicy: api.RestartPolicyAlways,
}
currentState := api.PodStatus{
Host: "machine",
}
tests := []struct {
pod *api.Pod
status api.PodPhase
test string
}{
{&api.Pod{Spec: desiredState, Status: currentState}, api.PodPending, "waiting"},
{&api.Pod{Spec: desiredState, Status: api.PodStatus{}}, api.PodPending, "waiting"},
{
&api.Pod{
Spec: desiredState,
@@ -2193,7 +2191,6 @@ func TestPodPhaseWithRestartAlways(t *testing.T) {
runningState("containerA"),
runningState("containerB"),
},
Host: "machine",
},
},
api.PodRunning,
@@ -2207,7 +2204,6 @@ func TestPodPhaseWithRestartAlways(t *testing.T) {
stoppedState("containerA"),
stoppedState("containerB"),
},
Host: "machine",
},
},
api.PodRunning,
@@ -2221,7 +2217,6 @@ func TestPodPhaseWithRestartAlways(t *testing.T) {
runningState("containerA"),
stoppedState("containerB"),
},
Host: "machine",
},
},
api.PodRunning,
@@ -2234,7 +2229,6 @@ func TestPodPhaseWithRestartAlways(t *testing.T) {
ContainerStatuses: []api.ContainerStatus{
runningState("containerA"),
},
Host: "machine",
},
},
api.PodPending,
@@ -2250,22 +2244,20 @@ func TestPodPhaseWithRestartAlways(t *testing.T) {
func TestPodPhaseWithRestartNever(t *testing.T) {
desiredState := api.PodSpec{
Host: "machine",
Containers: []api.Container{
{Name: "containerA"},
{Name: "containerB"},
},
RestartPolicy: api.RestartPolicyNever,
}
currentState := api.PodStatus{
Host: "machine",
}
tests := []struct {
pod *api.Pod
status api.PodPhase
test string
}{
{&api.Pod{Spec: desiredState, Status: currentState}, api.PodPending, "waiting"},
{&api.Pod{Spec: desiredState, Status: api.PodStatus{}}, api.PodPending, "waiting"},
{
&api.Pod{
Spec: desiredState,
@@ -2274,7 +2266,6 @@ func TestPodPhaseWithRestartNever(t *testing.T) {
runningState("containerA"),
runningState("containerB"),
},
Host: "machine",
},
},
api.PodRunning,
@@ -2288,7 +2279,6 @@ func TestPodPhaseWithRestartNever(t *testing.T) {
succeededState("containerA"),
succeededState("containerB"),
},
Host: "machine",
},
},
api.PodSucceeded,
@@ -2302,7 +2292,6 @@ func TestPodPhaseWithRestartNever(t *testing.T) {
failedState("containerA"),
failedState("containerB"),
},
Host: "machine",
},
},
api.PodFailed,
@@ -2316,7 +2305,6 @@ func TestPodPhaseWithRestartNever(t *testing.T) {
runningState("containerA"),
succeededState("containerB"),
},
Host: "machine",
},
},
api.PodRunning,
@@ -2329,7 +2317,6 @@ func TestPodPhaseWithRestartNever(t *testing.T) {
ContainerStatuses: []api.ContainerStatus{
runningState("containerA"),
},
Host: "machine",
},
},
api.PodPending,
@@ -2345,22 +2332,20 @@ func TestPodPhaseWithRestartNever(t *testing.T) {
func TestPodPhaseWithRestartOnFailure(t *testing.T) {
desiredState := api.PodSpec{
Host: "machine",
Containers: []api.Container{
{Name: "containerA"},
{Name: "containerB"},
},
RestartPolicy: api.RestartPolicyOnFailure,
}
currentState := api.PodStatus{
Host: "machine",
}
tests := []struct {
pod *api.Pod
status api.PodPhase
test string
}{
{&api.Pod{Spec: desiredState, Status: currentState}, api.PodPending, "waiting"},
{&api.Pod{Spec: desiredState, Status: api.PodStatus{}}, api.PodPending, "waiting"},
{
&api.Pod{
Spec: desiredState,
@@ -2369,7 +2354,6 @@ func TestPodPhaseWithRestartOnFailure(t *testing.T) {
runningState("containerA"),
runningState("containerB"),
},
Host: "machine",
},
},
api.PodRunning,
@@ -2383,7 +2367,6 @@ func TestPodPhaseWithRestartOnFailure(t *testing.T) {
succeededState("containerA"),
succeededState("containerB"),
},
Host: "machine",
},
},
api.PodSucceeded,
@@ -2397,7 +2380,6 @@ func TestPodPhaseWithRestartOnFailure(t *testing.T) {
failedState("containerA"),
failedState("containerB"),
},
Host: "machine",
},
},
api.PodRunning,
@@ -2411,7 +2393,6 @@ func TestPodPhaseWithRestartOnFailure(t *testing.T) {
runningState("containerA"),
succeededState("containerB"),
},
Host: "machine",
},
},
api.PodRunning,
@@ -2424,7 +2405,6 @@ func TestPodPhaseWithRestartOnFailure(t *testing.T) {
ContainerStatuses: []api.ContainerStatus{
runningState("containerA"),
},
Host: "machine",
},
},
api.PodPending,