github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 14:45:28 +00:00
Code Issues Projects Releases Wiki Activity

Refactor PodCondition to PodPhase

Browse Source
This commit is contained in:
markturansky
2014-11-21 14:04:32 -05:00
parent 9f5ebef3d8
commit 8159c8fd25
16 changed files with 57 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/registry/pod/rest.go
View File

@@ -129,7 +129,7 @@ func (rs *REST) Get(ctx api.Context, id string) (runtime.Object, error) {
if err != nil {
return pod, err
}
pod.Status.Condition = status
pod.Status.Phase = status
}
if pod.Status.Host != "" {
pod.Status.HostIP = rs.getInstanceIP(pod.Status.Host)
@@ -143,11 +143,11 @@ func (rs *REST) podToSelectableFields(pod *api.Pod) labels.Set {
// see https://github.com/GoogleCloudPlatform/kubernetes/pull/2503
var olderPodStatus v1beta1.PodStatus
api.Scheme.Convert(pod.Status.Condition, &olderPodStatus)
api.Scheme.Convert(pod.Status.Phase, &olderPodStatus)
return labels.Set{
"name": pod.Name,
"Status.Condition": string(pod.Status.Condition),
"Status.Phase": string(pod.Status.Phase),
"Status.Host": pod.Status.Host,
"DesiredState.Status": string(olderPodStatus),
"DesiredState.Host": pod.Status.Host,
@@ -173,7 +173,7 @@ func (rs *REST) List(ctx api.Context, label, field labels.Selector) (runtime.Obj
if err != nil {
return pod, err
}
pod.Status.Condition = status
pod.Status.Phase = status
if pod.Status.Host != "" {
pod.Status.HostIP = rs.getInstanceIP(pod.Status.Host)
}
@@ -274,7 +274,7 @@ func getInstanceIPFromCloud(cloud cloudprovider.Interface, host string) string {
return addr.String()
}
func getPodStatus(pod *api.Pod, minions client.MinionInterface) (api.PodCondition, error) {
func getPodStatus(pod *api.Pod, minions client.MinionInterface) (api.PodPhase, error) {
if pod.Status.Host == "" {
return api.PodPending, nil
}

6
pkg/registry/pod/rest_test.go
View File

@@ -205,7 +205,7 @@ func TestListPodListSelection(t *testing.T) {
Status: api.PodStatus{Host: "barhost"},
}, {
ObjectMeta: api.ObjectMeta{Name: "baz"},
Status: api.PodStatus{Condition: "bazstatus"},
Status: api.PodStatus{Phase: "bazstatus"},
}, {
ObjectMeta: api.ObjectMeta{
Name: "qux",
@@ -236,7 +236,7 @@ func TestListPodListSelection(t *testing.T) {
label: "label=qux",
expectedIDs: util.NewStringSet("qux"),
}, {
field: "Status.Condition=bazstatus",
field: "Status.Phase=bazstatus",
expectedIDs: util.NewStringSet("baz"),
}, {
field: "Status.Host=barhost",
@@ -400,7 +400,7 @@ func TestMakePodStatus(t *testing.T) {
tests := []struct {
pod *api.Pod
status api.PodCondition
status api.PodPhase
test string
}{
{&api.Pod{Spec: desiredState, Status: currentState}, api.PodPending, "waiting"},