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
c0b3fc45
Commit
c0b3fc45
authored
Feb 18, 2016
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #21462 from gmarek/nodecontroller
Auto commit by PR queue bot
parents
48109edc
0d7f3bca
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
nodecontroller.go
pkg/controller/node/nodecontroller.go
+2
-2
No files found.
pkg/controller/node/nodecontroller.go
View file @
c0b3fc45
...
...
@@ -508,7 +508,7 @@ func (nc *NodeController) reconcileNodeCIDRs(nodes *api.NodeList) {
availableCIDRs
:=
generateCIDRs
(
nc
.
clusterCIDR
,
len
(
nodes
.
Items
))
for
_
,
node
:=
range
nodes
.
Items
{
if
node
.
Spec
.
PodCIDR
!=
""
{
glog
.
V
(
4
)
.
Infof
(
"CIDR %s is already being used by node %s"
,
node
.
Spec
.
PodCIDR
,
node
.
Name
)
glog
.
V
(
1
)
.
Infof
(
"CIDR %s is already being used by node %s"
,
node
.
Spec
.
PodCIDR
,
node
.
Name
)
availableCIDRs
.
Delete
(
node
.
Spec
.
PodCIDR
)
}
}
...
...
@@ -525,7 +525,7 @@ func (nc *NodeController) reconcileNodeCIDRs(nodes *api.NodeList) {
nc
.
recordNodeStatusChange
(
n
,
"CIDRNotAvailable"
)
continue
}
glog
.
V
(
4
)
.
Infof
(
"Assigning node %s CIDR %s"
,
n
.
Name
,
podCIDR
)
glog
.
V
(
1
)
.
Infof
(
"Assigning node %s CIDR %s"
,
n
.
Name
,
podCIDR
)
n
.
Spec
.
PodCIDR
=
podCIDR
if
_
,
err
:=
nc
.
kubeClient
.
Core
()
.
Nodes
()
.
Update
(
n
);
err
!=
nil
{
nc
.
recordNodeStatusChange
(
&
node
,
"CIDRAssignmentFailed"
)
...
...
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