cmd/kubelet

This commit is contained in:
Chao Xu
2016-11-18 12:50:58 -08:00
parent 7eeb71f698
commit 5e1adf91df
178 changed files with 3685 additions and 3560 deletions

View File

@@ -20,89 +20,89 @@ import (
"reflect"
"testing"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1"
)
func TestGeneratePodReadyCondition(t *testing.T) {
tests := []struct {
spec *api.PodSpec
containerStatuses []api.ContainerStatus
podPhase api.PodPhase
expected api.PodCondition
spec *v1.PodSpec
containerStatuses []v1.ContainerStatus
podPhase v1.PodPhase
expected v1.PodCondition
}{
{
spec: nil,
containerStatuses: nil,
podPhase: api.PodRunning,
podPhase: v1.PodRunning,
expected: getReadyCondition(false, "UnknownContainerStatuses", ""),
},
{
spec: &api.PodSpec{},
containerStatuses: []api.ContainerStatus{},
podPhase: api.PodRunning,
spec: &v1.PodSpec{},
containerStatuses: []v1.ContainerStatus{},
podPhase: v1.PodRunning,
expected: getReadyCondition(true, "", ""),
},
{
spec: &api.PodSpec{
Containers: []api.Container{
spec: &v1.PodSpec{
Containers: []v1.Container{
{Name: "1234"},
},
},
containerStatuses: []api.ContainerStatus{},
podPhase: api.PodRunning,
containerStatuses: []v1.ContainerStatus{},
podPhase: v1.PodRunning,
expected: getReadyCondition(false, "ContainersNotReady", "containers with unknown status: [1234]"),
},
{
spec: &api.PodSpec{
Containers: []api.Container{
spec: &v1.PodSpec{
Containers: []v1.Container{
{Name: "1234"},
{Name: "5678"},
},
},
containerStatuses: []api.ContainerStatus{
containerStatuses: []v1.ContainerStatus{
getReadyStatus("1234"),
getReadyStatus("5678"),
},
podPhase: api.PodRunning,
podPhase: v1.PodRunning,
expected: getReadyCondition(true, "", ""),
},
{
spec: &api.PodSpec{
Containers: []api.Container{
spec: &v1.PodSpec{
Containers: []v1.Container{
{Name: "1234"},
{Name: "5678"},
},
},
containerStatuses: []api.ContainerStatus{
containerStatuses: []v1.ContainerStatus{
getReadyStatus("1234"),
},
podPhase: api.PodRunning,
podPhase: v1.PodRunning,
expected: getReadyCondition(false, "ContainersNotReady", "containers with unknown status: [5678]"),
},
{
spec: &api.PodSpec{
Containers: []api.Container{
spec: &v1.PodSpec{
Containers: []v1.Container{
{Name: "1234"},
{Name: "5678"},
},
},
containerStatuses: []api.ContainerStatus{
containerStatuses: []v1.ContainerStatus{
getReadyStatus("1234"),
getNotReadyStatus("5678"),
},
podPhase: api.PodRunning,
podPhase: v1.PodRunning,
expected: getReadyCondition(false, "ContainersNotReady", "containers with unready status: [5678]"),
},
{
spec: &api.PodSpec{
Containers: []api.Container{
spec: &v1.PodSpec{
Containers: []v1.Container{
{Name: "1234"},
},
},
containerStatuses: []api.ContainerStatus{
containerStatuses: []v1.ContainerStatus{
getNotReadyStatus("1234"),
},
podPhase: api.PodSucceeded,
podPhase: v1.PodSucceeded,
expected: getReadyCondition(false, "PodCompleted", ""),
},
}
@@ -115,28 +115,28 @@ func TestGeneratePodReadyCondition(t *testing.T) {
}
}
func getReadyCondition(ready bool, reason, message string) api.PodCondition {
status := api.ConditionFalse
func getReadyCondition(ready bool, reason, message string) v1.PodCondition {
status := v1.ConditionFalse
if ready {
status = api.ConditionTrue
status = v1.ConditionTrue
}
return api.PodCondition{
Type: api.PodReady,
return v1.PodCondition{
Type: v1.PodReady,
Status: status,
Reason: reason,
Message: message,
}
}
func getReadyStatus(cName string) api.ContainerStatus {
return api.ContainerStatus{
func getReadyStatus(cName string) v1.ContainerStatus {
return v1.ContainerStatus{
Name: cName,
Ready: true,
}
}
func getNotReadyStatus(cName string) api.ContainerStatus {
return api.ContainerStatus{
func getNotReadyStatus(cName string) v1.ContainerStatus {
return v1.ContainerStatus{
Name: cName,
Ready: false,
}