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
1c9ee749
Commit
1c9ee749
authored
Sep 05, 2016
by
Ivan Shvedunov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow IP addresses to be used as node names
Fixes #32050
parent
aee6d10b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
validation.go
pkg/api/validation/validation.go
+4
-2
validation_test.go
pkg/api/validation/validation_test.go
+10
-2
No files found.
pkg/api/validation/validation.go
View file @
1c9ee749
...
...
@@ -3435,9 +3435,11 @@ func validateEndpointAddress(address *api.EndpointAddress, fldPath *field.Path,
if
len
(
address
.
Hostname
)
>
0
{
allErrs
=
append
(
allErrs
,
ValidateDNS1123Label
(
address
.
Hostname
,
fldPath
.
Child
(
"hostname"
))
...
)
}
// During endpoint update, v
alidate NodeName is DNS1123 compliant
and transition rules allow the update
// During endpoint update, v
erify that NodeName is a DNS subdomain
and transition rules allow the update
if
address
.
NodeName
!=
nil
{
allErrs
=
append
(
allErrs
,
ValidateDNS1123Label
(
*
address
.
NodeName
,
fldPath
.
Child
(
"nodeName"
))
...
)
for
_
,
msg
:=
range
ValidateNodeName
(
*
address
.
NodeName
,
false
)
{
allErrs
=
append
(
allErrs
,
field
.
Invalid
(
fldPath
.
Child
(
"nodeName"
),
*
address
.
NodeName
,
msg
))
}
}
allErrs
=
append
(
allErrs
,
validateEpAddrNodeNameTransition
(
address
,
ipToNodeName
,
fldPath
.
Child
(
"nodeName"
))
...
)
if
len
(
allErrs
)
>
0
{
...
...
pkg/api/validation/validation_test.go
View file @
1c9ee749
...
...
@@ -8023,11 +8023,19 @@ func TestEndpointAddressNodeNameUpdateRestrictions(t *testing.T) {
}
}
func
TestEndpointAddressNodeNameInvalidDNS
1123
(
t
*
testing
.
T
)
{
func
TestEndpointAddressNodeNameInvalidDNS
Subdomain
(
t
*
testing
.
T
)
{
// Check NodeName DNS validation
endpoint
:=
newNodeNameEndpoint
(
"illegal.nodename"
)
endpoint
:=
newNodeNameEndpoint
(
"illegal
*
.nodename"
)
errList
:=
ValidateEndpoints
(
endpoint
)
if
len
(
errList
)
==
0
{
t
.
Error
(
"Endpoint should reject invalid NodeName"
)
}
}
func
TestEndpointAddressNodeNameCanBeAnIPAddress
(
t
*
testing
.
T
)
{
endpoint
:=
newNodeNameEndpoint
(
"10.10.1.1"
)
errList
:=
ValidateEndpoints
(
endpoint
)
if
len
(
errList
)
!=
0
{
t
.
Error
(
"Endpoint should accept a NodeName that is an IP address"
)
}
}
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