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
688cae77
Commit
688cae77
authored
Feb 11, 2016
by
Madhusudan.C.S
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't call DaemonSet and HPA type variables controller, it is just confusing to the reader.
This was likely due to a copy-paste replication controller validation code.
parent
bc047595
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
validation.go
pkg/apis/extensions/validation/validation.go
+12
-12
No files found.
pkg/apis/extensions/validation/validation.go
View file @
688cae77
...
@@ -124,9 +124,9 @@ func ValidateHorizontalPodAutoscalerUpdate(newAutoscaler, oldAutoscaler *extensi
...
@@ -124,9 +124,9 @@ func ValidateHorizontalPodAutoscalerUpdate(newAutoscaler, oldAutoscaler *extensi
return
allErrs
return
allErrs
}
}
func
ValidateHorizontalPodAutoscalerStatusUpdate
(
controller
,
oldControl
ler
*
extensions
.
HorizontalPodAutoscaler
)
field
.
ErrorList
{
func
ValidateHorizontalPodAutoscalerStatusUpdate
(
newAutoscaler
,
oldAutosca
ler
*
extensions
.
HorizontalPodAutoscaler
)
field
.
ErrorList
{
allErrs
:=
apivalidation
.
ValidateObjectMetaUpdate
(
&
controller
.
ObjectMeta
,
&
oldControl
ler
.
ObjectMeta
,
field
.
NewPath
(
"metadata"
))
allErrs
:=
apivalidation
.
ValidateObjectMetaUpdate
(
&
newAutoscaler
.
ObjectMeta
,
&
oldAutosca
ler
.
ObjectMeta
,
field
.
NewPath
(
"metadata"
))
status
:=
control
ler
.
Status
status
:=
newAutosca
ler
.
Status
allErrs
=
append
(
allErrs
,
apivalidation
.
ValidateNonnegativeField
(
int64
(
status
.
CurrentReplicas
),
field
.
NewPath
(
"status"
,
"currentReplicas"
))
...
)
allErrs
=
append
(
allErrs
,
apivalidation
.
ValidateNonnegativeField
(
int64
(
status
.
CurrentReplicas
),
field
.
NewPath
(
"status"
,
"currentReplicas"
))
...
)
allErrs
=
append
(
allErrs
,
apivalidation
.
ValidateNonnegativeField
(
int64
(
status
.
DesiredReplicas
),
field
.
NewPath
(
"status"
,
"desiredReplicasa"
))
...
)
allErrs
=
append
(
allErrs
,
apivalidation
.
ValidateNonnegativeField
(
int64
(
status
.
DesiredReplicas
),
field
.
NewPath
(
"status"
,
"desiredReplicasa"
))
...
)
return
allErrs
return
allErrs
...
@@ -162,16 +162,16 @@ func ValidateThirdPartyResource(obj *extensions.ThirdPartyResource) field.ErrorL
...
@@ -162,16 +162,16 @@ func ValidateThirdPartyResource(obj *extensions.ThirdPartyResource) field.ErrorL
}
}
// ValidateDaemonSet tests if required fields in the DaemonSet are set.
// ValidateDaemonSet tests if required fields in the DaemonSet are set.
func
ValidateDaemonSet
(
controller
*
extensions
.
DaemonSet
)
field
.
ErrorList
{
func
ValidateDaemonSet
(
ds
*
extensions
.
DaemonSet
)
field
.
ErrorList
{
allErrs
:=
apivalidation
.
ValidateObjectMeta
(
&
controller
.
ObjectMeta
,
true
,
ValidateDaemonSetName
,
field
.
NewPath
(
"metadata"
))
allErrs
:=
apivalidation
.
ValidateObjectMeta
(
&
ds
.
ObjectMeta
,
true
,
ValidateDaemonSetName
,
field
.
NewPath
(
"metadata"
))
allErrs
=
append
(
allErrs
,
ValidateDaemonSetSpec
(
&
controller
.
Spec
,
field
.
NewPath
(
"spec"
))
...
)
allErrs
=
append
(
allErrs
,
ValidateDaemonSetSpec
(
&
ds
.
Spec
,
field
.
NewPath
(
"spec"
))
...
)
return
allErrs
return
allErrs
}
}
// ValidateDaemonSetUpdate tests if required fields in the DaemonSet are set.
// ValidateDaemonSetUpdate tests if required fields in the DaemonSet are set.
func
ValidateDaemonSetUpdate
(
controller
,
oldController
*
extensions
.
DaemonSet
)
field
.
ErrorList
{
func
ValidateDaemonSetUpdate
(
ds
,
oldDS
*
extensions
.
DaemonSet
)
field
.
ErrorList
{
allErrs
:=
apivalidation
.
ValidateObjectMetaUpdate
(
&
controller
.
ObjectMeta
,
&
oldController
.
ObjectMeta
,
field
.
NewPath
(
"metadata"
))
allErrs
:=
apivalidation
.
ValidateObjectMetaUpdate
(
&
ds
.
ObjectMeta
,
&
oldDS
.
ObjectMeta
,
field
.
NewPath
(
"metadata"
))
allErrs
=
append
(
allErrs
,
ValidateDaemonSetSpec
(
&
controller
.
Spec
,
field
.
NewPath
(
"spec"
))
...
)
allErrs
=
append
(
allErrs
,
ValidateDaemonSetSpec
(
&
ds
.
Spec
,
field
.
NewPath
(
"spec"
))
...
)
return
allErrs
return
allErrs
}
}
...
@@ -185,9 +185,9 @@ func validateDaemonSetStatus(status *extensions.DaemonSetStatus, fldPath *field.
...
@@ -185,9 +185,9 @@ func validateDaemonSetStatus(status *extensions.DaemonSetStatus, fldPath *field.
}
}
// ValidateDaemonSetStatus validates tests if required fields in the DaemonSet Status section
// ValidateDaemonSetStatus validates tests if required fields in the DaemonSet Status section
func
ValidateDaemonSetStatusUpdate
(
controller
,
oldController
*
extensions
.
DaemonSet
)
field
.
ErrorList
{
func
ValidateDaemonSetStatusUpdate
(
ds
,
oldDS
*
extensions
.
DaemonSet
)
field
.
ErrorList
{
allErrs
:=
apivalidation
.
ValidateObjectMetaUpdate
(
&
controller
.
ObjectMeta
,
&
oldController
.
ObjectMeta
,
field
.
NewPath
(
"metadata"
))
allErrs
:=
apivalidation
.
ValidateObjectMetaUpdate
(
&
ds
.
ObjectMeta
,
&
oldDS
.
ObjectMeta
,
field
.
NewPath
(
"metadata"
))
allErrs
=
append
(
allErrs
,
validateDaemonSetStatus
(
&
controller
.
Status
,
field
.
NewPath
(
"status"
))
...
)
allErrs
=
append
(
allErrs
,
validateDaemonSetStatus
(
&
ds
.
Status
,
field
.
NewPath
(
"status"
))
...
)
return
allErrs
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