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
e68fe4d6
Commit
e68fe4d6
authored
Nov 21, 2016
by
Brendan Burns
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove 'minion' from the code in two places in favor of 'node'
parent
0042ce56
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
validation_test.go
pkg/api/validation/validation_test.go
+1
-1
controller_utils.go
pkg/controller/node/controller_utils.go
+1
-1
No files found.
pkg/api/validation/validation_test.go
View file @
e68fe4d6
...
...
@@ -8680,7 +8680,7 @@ func newNodeNameEndpoint(nodeName string) *api.Endpoints {
}
func
TestEndpointAddressNodeNameUpdateRestrictions
(
t
*
testing
.
T
)
{
oldEndpoint
:=
newNodeNameEndpoint
(
"kubernetes-
minion
-setup-by-backend"
)
oldEndpoint
:=
newNodeNameEndpoint
(
"kubernetes-
node
-setup-by-backend"
)
updatedEndpoint
:=
newNodeNameEndpoint
(
"kubernetes-changed-nodename"
)
// Check that NodeName cannot be changed during update (if already set)
errList
:=
ValidateEndpoints
(
updatedEndpoint
)
...
...
pkg/controller/node/controller_utils.go
View file @
e68fe4d6
...
...
@@ -179,7 +179,7 @@ func (nc *NodeController) maybeDeleteTerminatingPod(obj interface{}) {
node
:=
nodeObj
.
(
*
api
.
Node
)
v
,
err
:=
version
.
Parse
(
node
.
Status
.
NodeInfo
.
KubeletVersion
)
if
err
!=
nil
{
glog
.
V
(
0
)
.
Infof
(
"couldn't parse verions %q of
minion
: %v"
,
node
.
Status
.
NodeInfo
.
KubeletVersion
,
err
)
glog
.
V
(
0
)
.
Infof
(
"couldn't parse verions %q of
node
: %v"
,
node
.
Status
.
NodeInfo
.
KubeletVersion
,
err
)
utilruntime
.
HandleError
(
nc
.
forcefullyDeletePod
(
pod
))
return
}
...
...
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