diff --git a/pkg/api/types.go b/pkg/api/types.go index 0b761327ab2..fae5ef304c4 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -783,7 +783,7 @@ type NodeSpec struct { Capacity ResourceList `json:"capacity,omitempty"` // PodCIDR represents the pod IP range assigned to the node // Note: assigning IP ranges to nodes might need to be revisited when we support migratable IPs. - PodCIDR string `json:"cidr,omitempty"` + PodCIDR string `json:"podCIDR,omitempty"` // External ID of the node assigned by some machine database (e.g. a cloud provider) ExternalID string `json:"externalID,omitempty"` } diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index ec7a8e47d47..942f676c513 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -703,7 +703,7 @@ type Minion struct { // Resources available on the node NodeResources NodeResources `json:"resources,omitempty" description:"characterization of node resources"` // Pod IP range assigned to the node - PodCIDR string `json:"cidr,omitempty" description:"IP range assigned to the node"` + PodCIDR string `json:"podCIDR,omitempty" description:"IP range assigned to the node"` // Status describes the current status of a node Status NodeStatus `json:"status,omitempty" description:"current status of node"` // Labels for the node diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index 7a33b92ad6b..70965fed14a 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -722,7 +722,7 @@ type Minion struct { // Resources available on the node NodeResources NodeResources `json:"resources,omitempty" description:"characterization of node resources"` // Pod IP range assigned to the node - PodCIDR string `json:"cidr,omitempty" description:"IP range assigned to the node"` + PodCIDR string `json:"podCIDR,omitempty" description:"IP range assigned to the node"` // Status describes the current status of a node Status NodeStatus `json:"status,omitempty" description:"current status of node"` // Labels for the node diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index 4bfe077bea2..cee57ff9e12 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -814,7 +814,7 @@ type NodeSpec struct { // see https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md for more details. Capacity ResourceList `json:"capacity,omitempty" description:"compute resource capacity of the node; https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md"` // PodCIDR represents the pod IP range assigned to the node - PodCIDR string `json:"cidr,omitempty" description:"pod IP range assined to the node"` + PodCIDR string `json:"podCIDR,omitempty" description:"pod IP range assigned to the node"` // External ID of the node assigned by some machine database (e.g. a cloud provider) ExternalID string `json:"externalID,omitempty" description:"external ID assigned to the node by some machine database (e.g. a cloud provider)"` }