github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4262 from vishh/api_resources

Browse Source 
Rename ResourceRequirementSpec to ResourceRequirements.
This commit is contained in:
Brian Grant
2015-02-09 17:26:05 -08:00
parent 6167aeb8fa d0524d4778
commit e27d534b87
13 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/resource_helpers_test.go
View File

@@ -25,7 +25,7 @@ import (
func TestResourceHelpers(t *testing.T) {
cpuLimit := resource.MustParse("10")
memoryLimit := resource.MustParse("10G")
resourceSpec := ResourceRequirementSpec{
resourceSpec := ResourceRequirements{
Limits: ResourceList{
"cpu": cpuLimit,
"memory": memoryLimit,
@@ -38,7 +38,7 @@ func TestResourceHelpers(t *testing.T) {
if res := resourceSpec.Limits.Memory(); *res != memoryLimit {
t.Errorf("expected memorylimit %d, got %d", memoryLimit, res)
}
resourceSpec = ResourceRequirementSpec{
resourceSpec = ResourceRequirements{
Limits: ResourceList{
"memory": memoryLimit,
"kube.io/storage": memoryLimit,

12
pkg/api/types.go
View File

@@ -319,8 +319,8 @@ type Capabilities struct {
Drop []CapabilityType `json:"drop,omitempty"`
}
// ResourceRequirementSpec describes the compute resource requirements.
type ResourceRequirementSpec struct {
// ResourceRequirements describes the compute resource requirements.
type ResourceRequirements struct {
// Limits describes the maximum amount of compute resources required.
Limits ResourceList `json:"limits,omitempty"`
}
@@ -339,10 +339,10 @@ type Container struct {
Ports []Port `json:"ports,omitempty"`
Env []EnvVar `json:"env,omitempty"`
// Compute resource requirements.
Resources ResourceRequirementSpec `json:"resources,omitempty"`
VolumeMounts []VolumeMount `json:"volumeMounts,omitempty"`
LivenessProbe *Probe `json:"livenessProbe,omitempty"`
Lifecycle *Lifecycle `json:"lifecycle,omitempty"`
Resources ResourceRequirements `json:"resources,omitempty"`
VolumeMounts []VolumeMount `json:"volumeMounts,omitempty"`
LivenessProbe *Probe `json:"livenessProbe,omitempty"`
Lifecycle *Lifecycle `json:"lifecycle,omitempty"`
// Optional: Defaults to /dev/termination-log
TerminationMessagePath string `json:"terminationMessagePath,omitempty"`
// Optional: Default to false.

4
pkg/api/v1beta1/conversion_test.go
View File

@@ -319,8 +319,8 @@ func TestPullPolicyConversion(t *testing.T) {
}
}
func getResourceRequirements(cpu, memory resource.Quantity) current.ResourceRequirementSpec {
res := current.ResourceRequirementSpec{}
func getResourceRequirements(cpu, memory resource.Quantity) current.ResourceRequirements {
res := current.ResourceRequirements{}
res.Limits = current.ResourceList{}
if cpu.Value() > 0 {
res.Limits[current.ResourceCPU] = util.NewIntOrStringFromInt(int(cpu.Value()))

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

@@ -259,7 +259,7 @@ type Capabilities struct {
Drop []CapabilityType `json:"drop,omitempty" description:"droped capabilities"`
}
type ResourceRequirementSpec struct {
type ResourceRequirements struct {
// Limits describes the maximum amount of compute resources required.
Limits ResourceList `json:"limits,omitempty" description:"Maximum amount of compute resources allowed"`
}
@@ -274,10 +274,10 @@ type Container struct {
// Optional: Defaults to whatever is defined in the image.
Command []string `json:"command,omitempty" description:"command argv array; not executed within a shell; defaults to entrypoint or command in the image"`
// Optional: Defaults to Docker's default.
WorkingDir string `json:"workingDir,omitempty" description:"container's working directory; defaults to image's default"`
Ports []Port `json:"ports,omitempty" description:"list of ports to expose from the container"`
Env []EnvVar `json:"env,omitempty" description:"list of environment variables to set in the container"`
Resources ResourceRequirementSpec `json:"resources,omitempty" description:"Compute Resources required by this container"`
WorkingDir string `json:"workingDir,omitempty" description:"container's working directory; defaults to image's default"`
Ports []Port `json:"ports,omitempty" description:"list of ports to expose from the container"`
Env []EnvVar `json:"env,omitempty" description:"list of environment variables to set in the container"`
Resources ResourceRequirements `json:"resources,omitempty" description:"Compute Resources required by this container"`
// Optional: Defaults to unlimited.
CPU int `json:"cpu,omitempty" description:"CPU share in thousandths of a core"`
// Optional: Defaults to unlimited.

4
pkg/api/v1beta2/conversion_test.go
View File

@@ -149,8 +149,8 @@ func TestPullPolicyConversion(t *testing.T) {
}
}
func getResourceRequirements(cpu, memory resource.Quantity) current.ResourceRequirementSpec {
res := current.ResourceRequirementSpec{}
func getResourceRequirements(cpu, memory resource.Quantity) current.ResourceRequirements {
res := current.ResourceRequirements{}
res.Limits = current.ResourceList{}
if cpu.Value() > 0 {
res.Limits[current.ResourceCPU] = util.NewIntOrStringFromInt(int(cpu.Value()))

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

@@ -218,7 +218,7 @@ type Capabilities struct {
Drop []CapabilityType `json:"drop,omitempty" description:"droped capabilities"`
}
type ResourceRequirementSpec struct {
type ResourceRequirements struct {
// Limits describes the maximum amount of compute resources required.
Limits ResourceList `json:"limits,omitempty" description:"Maximum amount of compute resources allowed"`
}
@@ -233,10 +233,10 @@ type Container struct {
// Optional: Defaults to whatever is defined in the image.
Command []string `json:"command,omitempty" description:"command argv array; not executed within a shell; defaults to entrypoint or command in the image"`
// Optional: Defaults to Docker's default.
WorkingDir string `json:"workingDir,omitempty" description:"container's working directory; defaults to image's default"`
Ports []Port `json:"ports,omitempty" description:"list of ports to expose from the container"`
Env []EnvVar `json:"env,omitempty" description:"list of environment variables to set in the container"`
Resources ResourceRequirementSpec `json:"resources,omitempty" description:"Compute Resources required by this container"`
WorkingDir string `json:"workingDir,omitempty" description:"container's working directory; defaults to image's default"`
Ports []Port `json:"ports,omitempty" description:"list of ports to expose from the container"`
Env []EnvVar `json:"env,omitempty" description:"list of environment variables to set in the container"`
Resources ResourceRequirements `json:"resources,omitempty" description:"Compute Resources required by this container"`
// Optional: Defaults to unlimited.
CPU int `json:"cpu,omitempty" description:"CPU share in thousandths of a core"`
// Optional: Defaults to unlimited.

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

@@ -337,8 +337,8 @@ type Capabilities struct {
Drop []CapabilityType `json:"drop,omitempty"`
}
// ResourceRequirementSpec describes the compute resource requirements.
type ResourceRequirementSpec struct {
// ResourceRequirements describes the compute resource requirements.
type ResourceRequirements struct {
// Limits describes the maximum amount of compute resources required.
Limits ResourceList `json:"limits,omitempty" description:"Maximum amount of compute resources allowed"`
}
@@ -358,13 +358,13 @@ type Container struct {
// Optional: Defaults to whatever is defined in the image.
Command []string `json:"command,omitempty"`
// Optional: Defaults to Docker's default.
WorkingDir string `json:"workingDir,omitempty"`
Ports []Port `json:"ports,omitempty"`
Env []EnvVar `json:"env,omitempty"`
Resources ResourceRequirementSpec `json:"resources,omitempty" description:"Compute Resources required by this container"`
VolumeMounts []VolumeMount `json:"volumeMounts,omitempty"`
LivenessProbe *Probe `json:"livenessProbe,omitempty"`
Lifecycle *Lifecycle `json:"lifecycle,omitempty"`
WorkingDir string `json:"workingDir,omitempty"`
Ports []Port `json:"ports,omitempty"`
Env []EnvVar `json:"env,omitempty"`
Resources ResourceRequirements `json:"resources,omitempty" description:"Compute Resources required by this container"`
VolumeMounts []VolumeMount `json:"volumeMounts,omitempty"`
LivenessProbe *Probe `json:"livenessProbe,omitempty"`
Lifecycle *Lifecycle `json:"lifecycle,omitempty"`
// Optional: Defaults to /dev/termination-log
TerminationMessagePath string `json:"terminationMessagePath,omitempty"`
// Optional: Default to false.

14
pkg/api/validation/validation_test.go
View File

@@ -378,7 +378,7 @@ func TestValidateContainers(t *testing.T) {
{
Name: "resources-test",
Image: "image",
Resources: api.ResourceRequirementSpec{
Resources: api.ResourceRequirements{
Limits: api.ResourceList{
api.ResourceName(api.ResourceCPU): resource.MustParse("10"),
api.ResourceName(api.ResourceMemory): resource.MustParse("10G"),
@@ -459,7 +459,7 @@ func TestValidateContainers(t *testing.T) {
{
Name: "abc-123",
Image: "image",
Resources: api.ResourceRequirementSpec{
Resources: api.ResourceRequirements{
Limits: api.ResourceList{
"disk": resource.MustParse("10G"),
},
@@ -471,7 +471,7 @@ func TestValidateContainers(t *testing.T) {
{
Name: "abc-123",
Image: "image",
Resources: api.ResourceRequirementSpec{
Resources: api.ResourceRequirements{
Limits: getResourceLimits("-10", "0"),
},
ImagePullPolicy: "IfNotPresent",
@@ -481,7 +481,7 @@ func TestValidateContainers(t *testing.T) {
{
Name: "abc-123",
Image: "image",
Resources: api.ResourceRequirementSpec{
Resources: api.ResourceRequirements{
Limits: getResourceLimits("0", "-10"),
},
ImagePullPolicy: "IfNotPresent",
@@ -554,7 +554,7 @@ func TestValidateManifest(t *testing.T) {
Image: "image",
Command: []string{"foo", "bar"},
WorkingDir: "/tmp",
Resources: api.ResourceRequirementSpec{
Resources: api.ResourceRequirements{
Limits: api.ResourceList{
"cpu": resource.MustParse("1"),
"memory": resource.MustParse("1"),
@@ -877,7 +877,7 @@ func TestValidatePodUpdate(t *testing.T) {
Containers: []api.Container{
{
Image: "foo:V1",
Resources: api.ResourceRequirementSpec{
Resources: api.ResourceRequirements{
Limits: getResourceLimits("100m", "0"),
},
},
@@ -890,7 +890,7 @@ func TestValidatePodUpdate(t *testing.T) {
Containers: []api.Container{
{
Image: "foo:V2",
Resources: api.ResourceRequirementSpec{
Resources: api.ResourceRequirements{
Limits: getResourceLimits("1000m", "0"),
},
},