scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 12:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add node's IP range cidr to NodeSpec

Browse Source
This commit is contained in:
Tomek Kulczynski
2015-02-16 13:53:00 +01:00
parent 28dd73dd8c
commit 09c955f94e
6 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/types.go
View File

@@ -778,6 +778,9 @@ type EndpointsList struct {
type NodeSpec struct { type NodeSpec struct {
// Capacity represents the available resources of a node // Capacity represents the available resources of a node
Capacity ResourceList `json:"capacity,omitempty"` 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"`
} }
// NodeStatus is information about the current status of a node. // NodeStatus is information about the current status of a node.
@@ -844,7 +847,7 @@ const (
// ResourceList is a set of (resource name, quantity) pairs. // ResourceList is a set of (resource name, quantity) pairs.
type ResourceList map[ResourceName]resource.Quantity type ResourceList map[ResourceName]resource.Quantity
// Node is a worker node in Kubernetenes // Node is a worker node in Kubernetes
// The name of the node according to etcd is in ObjectMeta.Name. // The name of the node according to etcd is in ObjectMeta.Name.
type Node struct { type Node struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`

2
pkg/api/v1beta1/conversion.go
View File

@@ -698,6 +698,7 @@ func init() {
} }
out.HostIP = in.Status.HostIP out.HostIP = in.Status.HostIP
out.PodCIDR = in.Spec.PodCIDR
return s.Convert(&in.Spec.Capacity, &out.NodeResources.Capacity, 0) return s.Convert(&in.Spec.Capacity, &out.NodeResources.Capacity, 0)
}, },
func(in *Minion, out *newer.Node, s conversion.Scope) error { func(in *Minion, out *newer.Node, s conversion.Scope) error {
@@ -718,6 +719,7 @@ func init() {
} }
out.Status.HostIP = in.HostIP out.Status.HostIP = in.HostIP
out.Spec.PodCIDR = in.PodCIDR
return s.Convert(&in.NodeResources.Capacity, &out.Spec.Capacity, 0) return s.Convert(&in.NodeResources.Capacity, &out.Spec.Capacity, 0)
}, },
func(in *newer.LimitRange, out *LimitRange, s conversion.Scope) error { func(in *newer.LimitRange, out *LimitRange, s conversion.Scope) error {

2
pkg/api/v1beta1/types.go
View File

@@ -684,6 +684,8 @@ type Minion struct {
HostIP string `json:"hostIP,omitempty" description:"IP address of the node"` HostIP string `json:"hostIP,omitempty" description:"IP address of the node"`
// Resources available on the node // Resources available on the node
NodeResources NodeResources `json:"resources,omitempty" description:"characterization of node resources"` 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"`
// Status describes the current status of a node // Status describes the current status of a node
Status NodeStatus `json:"status,omitempty" description:"current status of node"` Status NodeStatus `json:"status,omitempty" description:"current status of node"`
// Labels for the node // Labels for the node

2
pkg/api/v1beta2/conversion.go
View File

@@ -618,6 +618,7 @@ func init() {
} }
out.HostIP = in.Status.HostIP out.HostIP = in.Status.HostIP
out.PodCIDR = in.Spec.PodCIDR
return s.Convert(&in.Spec.Capacity, &out.NodeResources.Capacity, 0) return s.Convert(&in.Spec.Capacity, &out.NodeResources.Capacity, 0)
}, },
func(in *Minion, out *newer.Node, s conversion.Scope) error { func(in *Minion, out *newer.Node, s conversion.Scope) error {
@@ -638,6 +639,7 @@ func init() {
} }
out.Status.HostIP = in.HostIP out.Status.HostIP = in.HostIP
out.Spec.PodCIDR = in.PodCIDR
return s.Convert(&in.NodeResources.Capacity, &out.Spec.Capacity, 0) return s.Convert(&in.NodeResources.Capacity, &out.Spec.Capacity, 0)
}, },
func(in *newer.LimitRange, out *LimitRange, s conversion.Scope) error { func(in *newer.LimitRange, out *LimitRange, s conversion.Scope) error {

2
pkg/api/v1beta2/types.go
View File

@@ -646,6 +646,8 @@ type Minion struct {
TypeMeta `json:",inline"` TypeMeta `json:",inline"`
// Queried from cloud provider, if available. // Queried from cloud provider, if available.
HostIP string `json:"hostIP,omitempty" description:"IP address of the node"` HostIP string `json:"hostIP,omitempty" description:"IP address of the node"`
// Pod IP range assigned to the node
PodCIDR string `json:"cidr,omitempty" description:"IP range assigned to the node"`
// Resources available on the node // Resources available on the node
NodeResources NodeResources `json:"resources,omitempty" description:"characterization of node resources"` NodeResources NodeResources `json:"resources,omitempty" description:"characterization of node resources"`
// Status describes the current status of a node // Status describes the current status of a node

2
pkg/api/v1beta3/types.go
View File

@@ -812,6 +812,8 @@ type NodeSpec struct {
// Capacity represents the available resources of a node // Capacity represents the available resources of a node
// see https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md for more details. // see https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md for more details.
Capacity ResourceList `json:"capacity,omitempty"` Capacity ResourceList `json:"capacity,omitempty"`
// PodCIDR represents the pod IP range assigned to the node
PodCIDR string `json:"cidr,omitempty"`
} }
// NodeStatus is information about the current status of a node. // NodeStatus is information about the current status of a node.