Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
66c1c5e2
Commit
66c1c5e2
authored
Dec 13, 2017
by
Jiaying Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Invalidate resource requirements on extended resources with only request
set.
parent
761fdeac
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
3 deletions
+25
-3
validation.go
pkg/apis/core/validation/validation.go
+3
-3
validation_test.go
pkg/apis/core/validation/validation_test.go
+22
-0
No files found.
pkg/apis/core/validation/validation.go
View file @
66c1c5e2
...
@@ -4366,14 +4366,14 @@ func ValidateResourceRequirements(requirements *core.ResourceRequirements, fldPa
...
@@ -4366,14 +4366,14 @@ func ValidateResourceRequirements(requirements *core.ResourceRequirements, fldPa
// Check that request <= limit.
// Check that request <= limit.
limitQuantity
,
exists
:=
requirements
.
Limits
[
resourceName
]
limitQuantity
,
exists
:=
requirements
.
Limits
[
resourceName
]
if
exists
{
if
exists
{
// For
GPU
s, not only requests can't exceed limits, they also can't be lower, i.e. must be equal.
// For
non overcommitable resource
s, not only requests can't exceed limits, they also can't be lower, i.e. must be equal.
if
quantity
.
Cmp
(
limitQuantity
)
!=
0
&&
!
helper
.
IsOvercommitAllowed
(
resourceName
)
{
if
quantity
.
Cmp
(
limitQuantity
)
!=
0
&&
!
helper
.
IsOvercommitAllowed
(
resourceName
)
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
reqPath
,
quantity
.
String
(),
fmt
.
Sprintf
(
"must be equal to %s limit"
,
resourceName
)))
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
reqPath
,
quantity
.
String
(),
fmt
.
Sprintf
(
"must be equal to %s limit"
,
resourceName
)))
}
else
if
quantity
.
Cmp
(
limitQuantity
)
>
0
{
}
else
if
quantity
.
Cmp
(
limitQuantity
)
>
0
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
reqPath
,
quantity
.
String
(),
fmt
.
Sprintf
(
"must be less than or equal to %s limit"
,
resourceName
)))
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
reqPath
,
quantity
.
String
(),
fmt
.
Sprintf
(
"must be less than or equal to %s limit"
,
resourceName
)))
}
}
}
else
if
resourceName
==
core
.
ResourceNvidiaGPU
{
}
else
if
!
helper
.
IsOvercommitAllowed
(
resourceName
)
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
reqPath
,
quantity
.
String
(),
fmt
.
Sprintf
(
"must be equal to %s request"
,
core
.
ResourceNvidiaGPU
)
))
allErrs
=
append
(
allErrs
,
field
.
Required
(
limPath
,
"Limit must be set for non overcommitable resources"
))
}
}
}
}
...
...
pkg/apis/core/validation/validation_test.go
View file @
66c1c5e2
...
@@ -6848,6 +6848,28 @@ func TestValidatePod(t *testing.T) {
...
@@ -6848,6 +6848,28 @@ func TestValidatePod(t *testing.T) {
},
},
},
},
},
},
"invalid extended resource requirement without limit"
:
{
expectedError
:
"Limit must be set"
,
spec
:
core
.
Pod
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"123"
,
Namespace
:
"ns"
},
Spec
:
core
.
PodSpec
{
Containers
:
[]
core
.
Container
{
{
Name
:
"invalid"
,
Image
:
"image"
,
ImagePullPolicy
:
"IfNotPresent"
,
Resources
:
core
.
ResourceRequirements
{
Requests
:
core
.
ResourceList
{
core
.
ResourceName
(
"example.com/a"
)
:
resource
.
MustParse
(
"2"
),
},
},
},
},
RestartPolicy
:
core
.
RestartPolicyAlways
,
DNSPolicy
:
core
.
DNSClusterFirst
,
},
},
},
"invalid fractional extended resource in container request"
:
{
"invalid fractional extended resource in container request"
:
{
expectedError
:
"must be an integer"
,
expectedError
:
"must be an integer"
,
spec
:
core
.
Pod
{
spec
:
core
.
Pod
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment