From 3b5a90852a6bed4aa7e67602744e205eb64f375a Mon Sep 17 00:00:00 2001 From: Vishnu Kannan Date: Tue, 28 Apr 2015 08:49:22 -0700 Subject: [PATCH] Explicitly state the lack of support for 'Requests' for the purposes of scheduling. --- pkg/api/types.go | 3 +++ pkg/api/v1/types.go | 5 ++++- pkg/api/v1beta1/types.go | 5 ++++- pkg/api/v1beta2/types.go | 5 ++++- pkg/api/v1beta3/types.go | 5 ++++- 5 files changed, 19 insertions(+), 4 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index cd9d2d74d68..83079260ad9 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -594,6 +594,9 @@ type ResourceRequirements struct { // Limits describes the maximum amount of compute resources required. Limits ResourceList `json:"limits,omitempty"` // Requests describes the minimum amount of compute resources required. + // Note: 'Requests' are honored only for Persistent Volumes as of now. + // TODO: Update the scheduler to use 'Requests' in addition to 'Limits'. If Request is omitted for a container, + // it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value Requests ResourceList `json:"requests,omitempty"` } diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 6e4b7cbf531..52609464fa1 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -603,7 +603,10 @@ type ResourceRequirements struct { // Limits describes the maximum amount of compute resources required. Limits ResourceList `json:"limits,omitempty" description:"Maximum amount of compute resources allowed"` // Requests describes the minimum amount of compute resources required. - Requests ResourceList `json:"requests,omitempty" description:"Minimum amount of resources requested"` + // Note: 'Requests' are honored only for Persistent Volumes as of now. + // TODO: Update the scheduler to use 'Requests' in addition to 'Limits'. If Request is omitted for a container, + // it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value + Requests ResourceList `json:"requests,omitempty" description:"Minimum amount of resources requested; requests are honored only for persistent volumes as of now"` } const ( diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index bf0a316701c..92fd9b47966 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -493,7 +493,10 @@ type ResourceRequirements struct { // Limits describes the maximum amount of compute resources required. Limits ResourceList `json:"limits,omitempty" description:"Maximum amount of compute resources allowed"` // Requests describes the minimum amount of compute resources required. - Requests ResourceList `json:"requests,omitempty" description:"Minimum amount of resources requested"` + // Note: 'Requests' are honored only for Persistent Volumes as of now. + // TODO: Update the scheduler to use 'Requests' in addition to 'Limits'. If Request is omitted for a container, + // it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value + Requests ResourceList `json:"requests,omitempty" description:"Minimum amount of resources requested; requests are honored only for persistent volumes as of now"` } // Container represents a single container that is expected to be run on the host. diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index c8bd3bca2ce..35ae1027dfa 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -479,7 +479,10 @@ type ResourceRequirements struct { // Limits describes the maximum amount of compute resources required. Limits ResourceList `json:"limits,omitempty" description:"Maximum amount of compute resources allowed"` // Requests describes the minimum amount of compute resources required. - Requests ResourceList `json:"requests,omitempty" description:"Minimum amount of resources requested"` + // Note: 'Requests' are honored only for Persistent Volumes as of now. + // TODO: Update the scheduler to use 'Requests' in addition to 'Limits'. If Request is omitted for a container, + // it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value + Requests ResourceList `json:"requests,omitempty" description:"Minimum amount of resources requested; requests are honored only for persistent volumes as of now"` } // Container represents a single container that is expected to be run on the host. diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index d995c4c8216..970654d86c0 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -603,7 +603,10 @@ type ResourceRequirements struct { // Limits describes the maximum amount of compute resources required. Limits ResourceList `json:"limits,omitempty" description:"Maximum amount of compute resources allowed"` // Requests describes the minimum amount of compute resources required. - Requests ResourceList `json:"requests,omitempty" description:"Minimum amount of resources requested"` + // Note: 'Requests' are honored only for Persistent Volumes as of now. + // TODO: Update the scheduler to use 'Requests' in addition to 'Limits'. If Request is omitted for a container, + // it defaults to Limits if that is explicitly specified, otherwise to an implementation-defined value + Requests ResourceList `json:"requests,omitempty" description:"Minimum amount of resources requested; requests are honored only for persistent volumes as of now"` } const (