From 25ada0e11898c9512f802397873a046bac4e36eb Mon Sep 17 00:00:00 2001 From: dkorn Date: Mon, 11 May 2015 16:39:34 +0300 Subject: [PATCH] Inconsistency in api terminology of pod conditions While nodes returns the "conditions" key in api requests, pods returns "Condition". Also, from pods states docs it seems that the right terminology should be "conditions". Fixes #8038 --- pkg/api/types.go | 2 +- pkg/api/v1/types.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 44c408cdfd7..e8dcb75130f 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -828,7 +828,7 @@ type PodSpec struct { // state of a system. type PodStatus struct { Phase PodPhase `json:"phase,omitempty"` - Conditions []PodCondition `json:"Condition,omitempty"` + Conditions []PodCondition `json:"conditions,omitempty"` // A human readable message indicating details about why the pod is in this state. Message string `json:"message,omitempty"` diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 2ee4ea8726f..cb0c86723ba 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -830,7 +830,7 @@ type PodSpec struct { // state of a system. type PodStatus struct { Phase PodPhase `json:"phase,omitempty" description:"current condition of the pod."` - Conditions []PodCondition `json:"Condition,omitempty" description:"current service state of pod" patchStrategy:"merge" patchMergeKey:"type"` + Conditions []PodCondition `json:"conditions,omitempty" description:"current service state of pod" patchStrategy:"merge" patchMergeKey:"type"` // A human readable message indicating details about why the pod is in this state. Message string `json:"message,omitempty" description:"human readable message indicating details about why the pod is in this condition"`