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
a5cd96b8
Commit
a5cd96b8
authored
Dec 20, 2017
by
Di Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix hostport checking for initContainers since they run in sequential order
parent
f8134deb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
7 deletions
+75
-7
validation.go
pkg/apis/core/validation/validation.go
+13
-5
validation_test.go
pkg/apis/core/validation/validation_test.go
+62
-2
No files found.
pkg/apis/core/validation/validation.go
View file @
a5cd96b8
...
@@ -2518,7 +2518,7 @@ func validatePullPolicy(policy core.PullPolicy, fldPath *field.Path) field.Error
...
@@ -2518,7 +2518,7 @@ func validatePullPolicy(policy core.PullPolicy, fldPath *field.Path) field.Error
func
validateInitContainers
(
containers
,
otherContainers
[]
core
.
Container
,
deviceVolumes
map
[
string
]
core
.
VolumeSource
,
fldPath
*
field
.
Path
)
field
.
ErrorList
{
func
validateInitContainers
(
containers
,
otherContainers
[]
core
.
Container
,
deviceVolumes
map
[
string
]
core
.
VolumeSource
,
fldPath
*
field
.
Path
)
field
.
ErrorList
{
var
allErrs
field
.
ErrorList
var
allErrs
field
.
ErrorList
if
len
(
containers
)
>
0
{
if
len
(
containers
)
>
0
{
allErrs
=
append
(
allErrs
,
validateContainers
(
containers
,
deviceVolumes
,
fldPath
)
...
)
allErrs
=
append
(
allErrs
,
validateContainers
(
containers
,
true
,
deviceVolumes
,
fldPath
)
...
)
}
}
allNames
:=
sets
.
String
{}
allNames
:=
sets
.
String
{}
...
@@ -2546,7 +2546,7 @@ func validateInitContainers(containers, otherContainers []core.Container, device
...
@@ -2546,7 +2546,7 @@ func validateInitContainers(containers, otherContainers []core.Container, device
return
allErrs
return
allErrs
}
}
func
validateContainers
(
containers
[]
core
.
Container
,
volumes
map
[
string
]
core
.
VolumeSource
,
fldPath
*
field
.
Path
)
field
.
ErrorList
{
func
validateContainers
(
containers
[]
core
.
Container
,
isInitContainers
bool
,
volumes
map
[
string
]
core
.
VolumeSource
,
fldPath
*
field
.
Path
)
field
.
ErrorList
{
allErrs
:=
field
.
ErrorList
{}
allErrs
:=
field
.
ErrorList
{}
if
len
(
containers
)
==
0
{
if
len
(
containers
)
==
0
{
...
@@ -2603,8 +2603,16 @@ func validateContainers(containers []core.Container, volumes map[string]core.Vol
...
@@ -2603,8 +2603,16 @@ func validateContainers(containers []core.Container, volumes map[string]core.Vol
allErrs
=
append
(
allErrs
,
ValidateResourceRequirements
(
&
ctr
.
Resources
,
idxPath
.
Child
(
"resources"
))
...
)
allErrs
=
append
(
allErrs
,
ValidateResourceRequirements
(
&
ctr
.
Resources
,
idxPath
.
Child
(
"resources"
))
...
)
allErrs
=
append
(
allErrs
,
ValidateSecurityContext
(
ctr
.
SecurityContext
,
idxPath
.
Child
(
"securityContext"
))
...
)
allErrs
=
append
(
allErrs
,
ValidateSecurityContext
(
ctr
.
SecurityContext
,
idxPath
.
Child
(
"securityContext"
))
...
)
}
}
// Check for colliding ports across all containers.
allErrs
=
append
(
allErrs
,
checkHostPortConflicts
(
containers
,
fldPath
)
...
)
if
isInitContainers
{
// check initContainers one by one since they are running in sequential order.
for
_
,
initContainer
:=
range
containers
{
allErrs
=
append
(
allErrs
,
checkHostPortConflicts
([]
core
.
Container
{
initContainer
},
fldPath
)
...
)
}
}
else
{
// Check for colliding ports across all containers.
allErrs
=
append
(
allErrs
,
checkHostPortConflicts
(
containers
,
fldPath
)
...
)
}
return
allErrs
return
allErrs
}
}
...
@@ -2934,7 +2942,7 @@ func ValidatePodSpec(spec *core.PodSpec, fldPath *field.Path) field.ErrorList {
...
@@ -2934,7 +2942,7 @@ func ValidatePodSpec(spec *core.PodSpec, fldPath *field.Path) field.ErrorList {
vols
,
vErrs
:=
ValidateVolumes
(
spec
.
Volumes
,
fldPath
.
Child
(
"volumes"
))
vols
,
vErrs
:=
ValidateVolumes
(
spec
.
Volumes
,
fldPath
.
Child
(
"volumes"
))
allErrs
=
append
(
allErrs
,
vErrs
...
)
allErrs
=
append
(
allErrs
,
vErrs
...
)
allErrs
=
append
(
allErrs
,
validateContainers
(
spec
.
Containers
,
vols
,
fldPath
.
Child
(
"containers"
))
...
)
allErrs
=
append
(
allErrs
,
validateContainers
(
spec
.
Containers
,
false
,
vols
,
fldPath
.
Child
(
"containers"
))
...
)
allErrs
=
append
(
allErrs
,
validateInitContainers
(
spec
.
InitContainers
,
spec
.
Containers
,
vols
,
fldPath
.
Child
(
"initContainers"
))
...
)
allErrs
=
append
(
allErrs
,
validateInitContainers
(
spec
.
InitContainers
,
spec
.
Containers
,
vols
,
fldPath
.
Child
(
"initContainers"
))
...
)
allErrs
=
append
(
allErrs
,
validateRestartPolicy
(
&
spec
.
RestartPolicy
,
fldPath
.
Child
(
"restartPolicy"
))
...
)
allErrs
=
append
(
allErrs
,
validateRestartPolicy
(
&
spec
.
RestartPolicy
,
fldPath
.
Child
(
"restartPolicy"
))
...
)
allErrs
=
append
(
allErrs
,
validateDNSPolicy
(
&
spec
.
DNSPolicy
,
fldPath
.
Child
(
"dnsPolicy"
))
...
)
allErrs
=
append
(
allErrs
,
validateDNSPolicy
(
&
spec
.
DNSPolicy
,
fldPath
.
Child
(
"dnsPolicy"
))
...
)
...
...
pkg/apis/core/validation/validation_test.go
View file @
a5cd96b8
...
@@ -5316,7 +5316,7 @@ func TestValidateContainers(t *testing.T) {
...
@@ -5316,7 +5316,7 @@ func TestValidateContainers(t *testing.T) {
},
},
{
Name
:
"abc-1234"
,
Image
:
"image"
,
ImagePullPolicy
:
"IfNotPresent"
,
TerminationMessagePolicy
:
"File"
,
SecurityContext
:
fakeValidSecurityContext
(
true
)},
{
Name
:
"abc-1234"
,
Image
:
"image"
,
ImagePullPolicy
:
"IfNotPresent"
,
TerminationMessagePolicy
:
"File"
,
SecurityContext
:
fakeValidSecurityContext
(
true
)},
}
}
if
errs
:=
validateContainers
(
successCase
,
volumeDevices
,
field
.
NewPath
(
"field"
));
len
(
errs
)
!=
0
{
if
errs
:=
validateContainers
(
successCase
,
false
,
volumeDevices
,
field
.
NewPath
(
"field"
));
len
(
errs
)
!=
0
{
t
.
Errorf
(
"expected success: %v"
,
errs
)
t
.
Errorf
(
"expected success: %v"
,
errs
)
}
}
...
@@ -5578,7 +5578,67 @@ func TestValidateContainers(t *testing.T) {
...
@@ -5578,7 +5578,67 @@ func TestValidateContainers(t *testing.T) {
},
},
}
}
for
k
,
v
:=
range
errorCases
{
for
k
,
v
:=
range
errorCases
{
if
errs
:=
validateContainers
(
v
,
volumeDevices
,
field
.
NewPath
(
"field"
));
len
(
errs
)
==
0
{
if
errs
:=
validateContainers
(
v
,
false
,
volumeDevices
,
field
.
NewPath
(
"field"
));
len
(
errs
)
==
0
{
t
.
Errorf
(
"expected failure for %s"
,
k
)
}
}
}
func
TestValidateInitContainers
(
t
*
testing
.
T
)
{
volumeDevices
:=
make
(
map
[
string
]
core
.
VolumeSource
)
capabilities
.
SetForTests
(
capabilities
.
Capabilities
{
AllowPrivileged
:
true
,
})
successCase
:=
[]
core
.
Container
{
{
Name
:
"container-1-same-host-port-different-protocol"
,
Image
:
"image"
,
Ports
:
[]
core
.
ContainerPort
{
{
ContainerPort
:
80
,
HostPort
:
80
,
Protocol
:
"TCP"
},
{
ContainerPort
:
80
,
HostPort
:
80
,
Protocol
:
"UDP"
},
},
ImagePullPolicy
:
"IfNotPresent"
,
TerminationMessagePolicy
:
"File"
,
},
{
Name
:
"container-2-same-host-port-different-protocol"
,
Image
:
"image"
,
Ports
:
[]
core
.
ContainerPort
{
{
ContainerPort
:
80
,
HostPort
:
80
,
Protocol
:
"TCP"
},
{
ContainerPort
:
80
,
HostPort
:
80
,
Protocol
:
"UDP"
},
},
ImagePullPolicy
:
"IfNotPresent"
,
TerminationMessagePolicy
:
"File"
,
},
}
if
errs
:=
validateContainers
(
successCase
,
true
,
volumeDevices
,
field
.
NewPath
(
"field"
));
len
(
errs
)
!=
0
{
t
.
Errorf
(
"expected success: %v"
,
errs
)
}
capabilities
.
SetForTests
(
capabilities
.
Capabilities
{
AllowPrivileged
:
false
,
})
errorCases
:=
map
[
string
][]
core
.
Container
{
"duplicate ports"
:
{
{
Name
:
"abc"
,
Image
:
"image"
,
Ports
:
[]
core
.
ContainerPort
{
{
ContainerPort
:
8080
,
HostPort
:
8080
,
Protocol
:
"TCP"
,
},
{
ContainerPort
:
8080
,
HostPort
:
8080
,
Protocol
:
"TCP"
,
},
},
ImagePullPolicy
:
"IfNotPresent"
,
TerminationMessagePolicy
:
"File"
,
},
},
}
for
k
,
v
:=
range
errorCases
{
if
errs
:=
validateContainers
(
v
,
true
,
volumeDevices
,
field
.
NewPath
(
"field"
));
len
(
errs
)
==
0
{
t
.
Errorf
(
"expected failure for %s"
,
k
)
t
.
Errorf
(
"expected failure for %s"
,
k
)
}
}
}
}
...
...
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