Merge pull request #8247 from kazegusuri/fix-struct-field-tag

Fix struct field tag
This commit is contained in:
Victor Marmol 2015-05-14 10:36:34 -07:00
commit 07b8b79696
5 changed files with 15 additions and 15 deletions

View File

@ -702,7 +702,7 @@ type ContainerState struct {
type ContainerStatus struct {
// Each container in a pod must have a unique name.
Name string `name of the container; must be a DNS_LABEL and unique within the pod; cannot be updated"`
Name string `json:"name"`
// TODO(dchen1107): Should we rename PodStatus to a more generic name or have a separate states
// defined for container?
State ContainerState `json:"state,omitempty"`

View File

@ -282,7 +282,7 @@ type PersistentVolumeStatus struct {
type PersistentVolumeList struct {
TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds"`
Items []PersistentVolume `json:"items,omitempty" description:"list of persistent volumes"`
}
@ -292,7 +292,7 @@ type PersistentVolumeClaim struct {
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://docs.k8s.io/api-conventions.md#metadata"`
// Spec defines the volume requested by a pod author
Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description: "the desired characteristics of a volume"`
Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description:"the desired characteristics of a volume"`
// Status represents the current information about a claim
Status PersistentVolumeClaimStatus `json:"status,omitempty" description:"the current status of a persistent volume claim; read-only"`
@ -300,8 +300,8 @@ type PersistentVolumeClaim struct {
type PersistentVolumeClaimList struct {
TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds`
Items []PersistentVolumeClaim `json:"items,omitempty" description: "a list of persistent volume claims"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds"`
Items []PersistentVolumeClaim `json:"items,omitempty" description:"a list of persistent volume claims"`
}
// PersistentVolumeClaimSpec describes the common attributes of storage devices
@ -873,7 +873,7 @@ type Pod struct {
// PodList is a list of Pods.
type PodList struct {
TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds"`
Items []Pod `json:"items" description:"list of pods"`
}

View File

@ -193,7 +193,7 @@ type PersistentVolumeClaim struct {
TypeMeta `json:",inline"`
// Spec defines the volume requested by a pod author
Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description: "the desired characteristics of a volume"`
Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description:"the desired characteristics of a volume"`
// Status represents the current information about a claim
Status PersistentVolumeClaimStatus `json:"status,omitempty" description:"the current status of a persistent volume claim; read-only"`
@ -201,7 +201,7 @@ type PersistentVolumeClaim struct {
type PersistentVolumeClaimList struct {
TypeMeta `json:",inline"`
Items []PersistentVolumeClaim `json:"items,omitempty" description: "a list of persistent volume claims"`
Items []PersistentVolumeClaim `json:"items,omitempty" description:"a list of persistent volume claims"`
}
// PersistentVolumeClaimSpec describes the common attributes of storage devices

View File

@ -157,7 +157,7 @@ type PersistentVolumeClaim struct {
TypeMeta `json:",inline"`
// Spec defines the volume requested by a pod author
Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description: "the desired characteristics of a volume"`
Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description:"the desired characteristics of a volume"`
// Status represents the current information about a claim
Status PersistentVolumeClaimStatus `json:"status,omitempty" description:"the current status of a persistent volume claim; read-only"`
@ -165,7 +165,7 @@ type PersistentVolumeClaim struct {
type PersistentVolumeClaimList struct {
TypeMeta `json:",inline"`
Items []PersistentVolumeClaim `json:"items,omitempty" description: "a list of persistent volume claims"`
Items []PersistentVolumeClaim `json:"items,omitempty" description:"a list of persistent volume claims"`
}
// PersistentVolumeClaimSpec describes the common attributes of storage devices

View File

@ -282,7 +282,7 @@ type PersistentVolumeStatus struct {
type PersistentVolumeList struct {
TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds"`
Items []PersistentVolume `json:"items,omitempty" description:"list of persistent volumes"`
}
@ -292,7 +292,7 @@ type PersistentVolumeClaim struct {
ObjectMeta `json:"metadata,omitempty" description:"standard object metadata; see http://docs.k8s.io/api-conventions.md#metadata"`
// Spec defines the volume requested by a pod author
Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description: "the desired characteristics of a volume"`
Spec PersistentVolumeClaimSpec `json:"spec,omitempty" description:"the desired characteristics of a volume"`
// Status represents the current information about a claim
Status PersistentVolumeClaimStatus `json:"status,omitempty" description:"the current status of a persistent volume claim; read-only"`
@ -300,8 +300,8 @@ type PersistentVolumeClaim struct {
type PersistentVolumeClaimList struct {
TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds`
Items []PersistentVolumeClaim `json:"items,omitempty" description: "a list of persistent volume claims"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds"`
Items []PersistentVolumeClaim `json:"items,omitempty" description:"a list of persistent volume claims"`
}
// PersistentVolumeClaimSpec describes the common attributes of storage devices
@ -873,7 +873,7 @@ type Pod struct {
// PodList is a list of Pods.
type PodList struct {
TypeMeta `json:",inline"`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds`
ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://docs.k8s.io/api-conventions.md#types-kinds"`
Items []Pod `json:"items" description:"list of pods"`
}