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
e0288342
Commit
e0288342
authored
Feb 25, 2017
by
Michail Kargakis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix availableReplicas validation
parent
98d693e9
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
validation.go
pkg/api/validation/validation.go
+2
-2
validation.go
pkg/apis/extensions/validation/validation.go
+4
-4
No files found.
pkg/api/validation/validation.go
View file @
e0288342
...
...
@@ -2736,8 +2736,8 @@ func ValidateReplicationControllerStatusUpdate(controller, oldController *api.Re
if
controller
.
Status
.
AvailableReplicas
>
controller
.
Status
.
Replicas
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
statusPath
.
Child
(
"availableReplicas"
),
controller
.
Status
.
AvailableReplicas
,
msg
))
}
if
controller
.
Status
.
ReadyReplicas
>
controller
.
Status
.
Available
Replicas
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
statusPath
.
Child
(
"
readyReplicas"
),
controller
.
Status
.
ReadyReplicas
,
"cannot be greater than available
Replicas"
))
if
controller
.
Status
.
AvailableReplicas
>
controller
.
Status
.
Ready
Replicas
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
statusPath
.
Child
(
"
availableReplicas"
),
controller
.
Status
.
AvailableReplicas
,
"cannot be greater than ready
Replicas"
))
}
return
allErrs
}
...
...
pkg/apis/extensions/validation/validation.go
View file @
e0288342
...
...
@@ -292,8 +292,8 @@ func ValidateDeploymentStatus(status *extensions.DeploymentStatus, fldPath *fiel
if
status
.
AvailableReplicas
>
status
.
Replicas
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
fldPath
.
Child
(
"availableReplicas"
),
status
.
AvailableReplicas
,
msg
))
}
if
status
.
ReadyReplicas
>
status
.
Available
Replicas
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
fldPath
.
Child
(
"
readyReplicas"
),
status
.
ReadyReplicas
,
"cannot be greater than available
Replicas"
))
if
status
.
AvailableReplicas
>
status
.
Ready
Replicas
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
fldPath
.
Child
(
"
availableReplicas"
),
status
.
AvailableReplicas
,
"cannot be greater than ready
Replicas"
))
}
return
allErrs
}
...
...
@@ -528,8 +528,8 @@ func ValidateReplicaSetStatusUpdate(rs, oldRs *extensions.ReplicaSet) field.Erro
if
rs
.
Status
.
AvailableReplicas
>
rs
.
Status
.
Replicas
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
fldPath
.
Child
(
"availableReplicas"
),
rs
.
Status
.
AvailableReplicas
,
msg
))
}
if
rs
.
Status
.
ReadyReplicas
>
rs
.
Status
.
Available
Replicas
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
fldPath
.
Child
(
"
readyReplicas"
),
rs
.
Status
.
ReadyReplicas
,
"cannot be greater than available
Replicas"
))
if
rs
.
Status
.
AvailableReplicas
>
rs
.
Status
.
Ready
Replicas
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
fldPath
.
Child
(
"
availableReplicas"
),
rs
.
Status
.
AvailableReplicas
,
"cannot be greater than ready
Replicas"
))
}
return
allErrs
}
...
...
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