Add a resource fit predicate.

pkg/api/types.go

@@ -423,12 +423,26 @@ type EndpointsList struct {
 
 func (*EndpointsList) IsAnAPIObject() {}
 
+// NodeResources represents resources on a Kubernetes system node
+// see https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md for more details.
+type NodeResources struct {
+	// Capacity represents the available resources.
+	Capacity ResourceList `json:"capacity,omitempty" yaml:"capacity,omitempty"`
+}
+
+type ResourceName string
+
+// TODO Replace this with a more complete "Quantity" struct
+type ResourceList map[ResourceName]util.IntOrString
+
 // Minion is a worker node in Kubernetenes.
 // The name of the minion according to etcd is in JSONBase.ID.
 type Minion struct {
 	JSONBase `json:",inline" yaml:",inline"`
 	// Queried from cloud provider, if available.
 	HostIP string `json:"hostIP,omitempty" yaml:"hostIP,omitempty"`
+	// Resources available on the node
+	NodeResources NodeResources `json:"resources,omitempty" yaml:"resources,omitempty"`
 }
 
 func (*Minion) IsAnAPIObject() {}

pkg/api/v1beta1/types.go

@@ -436,12 +436,25 @@ type EndpointsList struct {
 
 func (*EndpointsList) IsAnAPIObject() {}
 
+// NodeResources represents resources on a Kubernetes system node
+// see https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md for more details.
+type NodeResources struct {
+	// Capacity represents the available resources.
+	Capacity ResourceList `json:"capacity,omitempty" yaml:"capacity,omitempty"`
+}
+
+type ResourceName string
+
+type ResourceList map[ResourceName]util.IntOrString
+
 // Minion is a worker node in Kubernetenes.
 // The name of the minion according to etcd is in JSONBase.ID.
 type Minion struct {
 	JSONBase `json:",inline" yaml:",inline"`
 	// Queried from cloud provider, if available.
 	HostIP string `json:"hostIP,omitempty" yaml:"hostIP,omitempty"`
+	// Resources available on the node
+	NodeResources NodeResources `json:"resources,omitempty" yaml:"resources,omitempty"`
 }
 
 func (*Minion) IsAnAPIObject() {}

pkg/api/v1beta2/types.go

@@ -433,12 +433,25 @@ type EndpointsList struct {
 
 func (*EndpointsList) IsAnAPIObject() {}
 
+// NodeResources represents resources on a Kubernetes system node
+// see https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md for more details.
+type NodeResources struct {
+	// Capacity represents the available resources.
+	Capacity ResourceList `json:"capacity,omitempty" yaml:"capacity,omitempty"`
+}
+
+type ResourceName string
+
+type ResourceList map[ResourceName]util.IntOrString
+
 // Minion is a worker node in Kubernetenes.
 // The name of the minion according to etcd is in JSONBase.ID.
 type Minion struct {
 	JSONBase `json:",inline" yaml:",inline"`
 	// Queried from cloud provider, if available.
 	HostIP string `json:"hostIP,omitempty" yaml:"hostIP,omitempty"`
+	// Resources available on the node
+	NodeResources NodeResources `json:"resources,omitempty" yaml:"resources,omitempty"`
 }
 
 func (*Minion) IsAnAPIObject() {}

pkg/api/v1beta3/types.go

@@ -550,10 +550,19 @@ type NodeSpec struct {
 
 // NodeStatus is information about the current status of a node.
 type NodeStatus struct {
-	// Queried from cloud provider, if available.
-	HostIP string `json:"hostIP,omitempty" yaml:"hostIP,omitempty"`
 }
 
+// NodeResources represents resources on a Kubernetes system node
+// see https://github.com/GoogleCloudPlatform/kubernetes/blob/master/docs/resources.md for more details.
+type NodeResources struct {
+	// Capacity represents the available resources.
+	Capacity ResourceList `json:"capacity,omitempty" yaml:"capacity,omitempty"`
+}
+
+type ResourceName string
+
+type ResourceList map[ResourceName]util.IntOrString
+
 // Node is a worker node in Kubernetenes.
 // The name of the node according to etcd is in JSONBase.ID.
 type Node struct {
@@ -565,6 +574,9 @@ type Node struct {
 
 	// Status describes the current status of a Node
 	Status NodeStatus `json:"status,omitempty" yaml:"status,omitempty"`
+
+	// NodeResources describe the resoruces available on the node.
+	NodeResources NodeResources `json:"resources,omitempty" yaml:"resources,omitempty"`
 }
 
 // NodeList is a list of minions.

pkg/resources/doc.go

@@ -0,0 +1,18 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// package resources has constants and utilities for dealing with resources
+package resources

pkg/resources/resources.go

@@ -0,0 +1,75 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resources
+
+import (
+	"strconv"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+	"github.com/golang/glog"
+)
+
+const (
+	CPU    api.ResourceName = "cpu"
+	Memory api.ResourceName = "memory"
+)
+
+// TODO: None of these currently handle SI units
+
+func GetFloatResource(resources api.ResourceList, name api.ResourceName, def float64) float64 {
+	value, found := resources[name]
+	if !found {
+		return def
+	}
+	if value.Kind == util.IntstrInt {
+		return float64(value.IntVal)
+	}
+	result, err := strconv.ParseFloat(value.StrVal, 64)
+	if err != nil {
+		glog.Errorf("parsing failed for %s: %s", name, value.StrVal)
+		return def
+	}
+	return result
+}
+
+func GetIntegerResource(resources api.ResourceList, name api.ResourceName, def int) int {
+	value, found := resources[name]
+	if !found {
+		return def
+	}
+	if value.Kind == util.IntstrInt {
+		return value.IntVal
+	}
+	result, err := strconv.Atoi(value.StrVal)
+	if err != nil {
+		glog.Errorf("parsing failed for %s: %s", name, value.StrVal)
+		return def
+	}
+	return result
+}
+
+func GetStringResource(resources api.ResourceList, name api.ResourceName, def string) string {
+	value, found := resources[name]
+	if !found {
+		return def
+	}
+	if value.Kind == util.IntstrInt {
+		return strconv.Itoa(value.IntVal)
+	}
+	return value.StrVal
+}

pkg/resources/resources_test.go

@@ -0,0 +1,169 @@
+/*
+Copyright 2014 Google Inc. All rights reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package resources
+
+import (
+	"testing"
+
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
+)
+
+func TestGetInteger(t *testing.T) {
+	tests := []struct {
+		res      api.ResourceList
+		name     api.ResourceName
+		expected int
+		def      int
+		test     string
+	}{
+		{
+			res:      api.ResourceList{},
+			name:     CPU,
+			expected: 1,
+			def:      1,
+			test:     "nothing present",
+		},
+		{
+			res: api.ResourceList{
+				CPU: util.NewIntOrStringFromInt(2),
+			},
+			name:     CPU,
+			expected: 2,
+			def:      1,
+			test:     "present",
+		},
+		{
+			res: api.ResourceList{
+				Memory: util.NewIntOrStringFromInt(2),
+			},
+			name:     CPU,
+			expected: 1,
+			def:      1,
+			test:     "not-present",
+		},
+		{
+			res: api.ResourceList{
+				CPU: util.NewIntOrStringFromString("2"),
+			},
+			name:     CPU,
+			expected: 2,
+			def:      1,
+			test:     "present-string",
+		},
+		{
+			res: api.ResourceList{
+				CPU: util.NewIntOrStringFromString("foo"),
+			},
+			name:     CPU,
+			expected: 1,
+			def:      1,
+			test:     "present-invalid",
+		},
+	}
+
+	for _, test := range tests {
+		val := GetIntegerResource(test.res, test.name, test.def)
+		if val != test.expected {
+			t.Errorf("%s: expected: %d found %d", test.expected, val)
+		}
+	}
+}
+func TestGetFloat(t *testing.T) {
+	tests := []struct {
+		res      api.ResourceList
+		name     api.ResourceName
+		expected float64
+		def      float64
+		test     string
+	}{
+		{
+			res:      api.ResourceList{},
+			name:     CPU,
+			expected: 1.5,
+			def:      1.5,
+			test:     "nothing present",
+		},
+		{
+			res: api.ResourceList{
+				CPU: util.NewIntOrStringFromInt(2),
+			},
+			name:     CPU,
+			expected: 2.0,
+			def:      1.5,
+			test:     "present",
+		},
+		{
+			res: api.ResourceList{
+				CPU: util.NewIntOrStringFromString("2.5"),
+			},
+			name:     CPU,
+			expected: 2.5,
+			def:      1,
+			test:     "present-string",
+		},
+		{
+			res: api.ResourceList{
+				CPU: util.NewIntOrStringFromString("foo"),
+			},
+			name:     CPU,
+			expected: 1,
+			def:      1,
+			test:     "present-invalid",
+		},
+	}
+
+	for _, test := range tests {
+		val := GetFloatResource(test.res, test.name, test.def)
+		if val != test.expected {
+			t.Errorf("%s: expected: %d found %d", test.expected, val)
+		}
+	}
+}
+func TestGetString(t *testing.T) {
+	tests := []struct {
+		res      api.ResourceList
+		name     api.ResourceName
+		expected string
+		def      string
+		test     string
+	}{
+		{
+			res:      api.ResourceList{},
+			name:     CPU,
+			expected: "foo",
+			def:      "foo",
+			test:     "nothing present",
+		},
+		{
+			res: api.ResourceList{
+				CPU: util.NewIntOrStringFromString("bar"),
+			},
+			name:     CPU,
+			expected: "bar",
+			def:      "foo",
+			test:     "present",
+		},
+	}
+
+	for _, test := range tests {
+		val := GetStringResource(test.res, test.name, test.def)
+		if val != test.expected {
+			t.Errorf("%s: expected: %d found %d", test.expected, val)
+		}
+	}
+}