Merge pull request #4546 from mikedanese/hook-fix

add descriptions to PodCondition struct tags
This commit is contained in:
Brian Grant 2015-02-18 13:41:29 -08:00
commit 079e70e210
2 changed files with 8 additions and 8 deletions

View File

@ -445,8 +445,8 @@ const (
// TODO: add LastTransitionTime, Reason, Message to match NodeCondition api.
type PodCondition struct {
Kind PodConditionKind `json:"kind"`
Status ConditionStatus `json:"status"`
Kind PodConditionKind `json:"kind" description:"kind of the condition, currently only Ready"`
Status ConditionStatus `json:"status" description:"status of the condition, one of Full, None, Unknown"`
}
// PodInfo contains one entry for every container with available info.
@ -644,8 +644,8 @@ const (
)
type NodeCondition struct {
Kind NodeConditionKind `json:"kind" description:"kind of the condition, one of reachable, ready"`
Status ConditionStatus `json:"status" description:"status of the condition, one of full, none, unknown"`
Kind NodeConditionKind `json:"kind" description:"kind of the condition, one of Reachable, Ready"`
Status ConditionStatus `json:"status" description:"status of the condition, one of Full, None, Unknown"`
LastProbeTime util.Time `json:"lastProbeTime,omitempty" description:"last time the condition was probed"`
LastTransitionTime util.Time `json:"lastTransitionTime,omitempty" description:"last time the condition transit from one status to another"`
Reason string `json:"reason,omitempty" description:"(brief) reason for the condition's last transition"`

View File

@ -409,8 +409,8 @@ const (
// TODO: add LastTransitionTime, Reason, Message to match NodeCondition api.
type PodCondition struct {
Kind PodConditionKind `json:"kind"`
Status ConditionStatus `json:"status"`
Kind PodConditionKind `json:"kind" description:"kind of the condition, currently only Ready"`
Status ConditionStatus `json:"status" description:"status of the condition, one of Full, None, Unknown"`
}
// PodInfo contains one entry for every container with available info.
@ -608,8 +608,8 @@ const (
)
type NodeCondition struct {
Kind NodeConditionKind `json:"kind" description:"kind of the condition, one of reachable, ready"`
Status ConditionStatus `json:"status" description:"status of the condition, one of full, none, unknown"`
Kind NodeConditionKind `json:"kind" description:"kind of the condition, one of Reachable, Ready"`
Status ConditionStatus `json:"status" description:"status of the condition, one of Full, None, Unknown"`
LastProbeTime util.Time `json:"lastProbeTime,omitempty" description:"last time the condition was probed"`
LastTransitionTime util.Time `json:"lastTransitionTime,omitempty" description:"last time the condition transit from one status to another"`
Reason string `json:"reason,omitempty" description:"(brief) reason for the condition's last transition"`