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
39a33b1b
Commit
39a33b1b
authored
Feb 01, 2018
by
augabet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
check taints when allocating CIDR for the cloud
parent
89cbdc0d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
BUILD
pkg/controller/nodeipam/ipam/BUILD
+2
-0
cloud_cidr_allocator.go
pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go
+4
-1
No files found.
pkg/controller/nodeipam/ipam/BUILD
View file @
39a33b1b
...
@@ -49,7 +49,9 @@ go_library(
...
@@ -49,7 +49,9 @@ go_library(
"//pkg/controller/nodeipam/ipam/cidrset:go_default_library",
"//pkg/controller/nodeipam/ipam/cidrset:go_default_library",
"//pkg/controller/nodeipam/ipam/sync:go_default_library",
"//pkg/controller/nodeipam/ipam/sync:go_default_library",
"//pkg/controller/util/node:go_default_library",
"//pkg/controller/util/node:go_default_library",
"//pkg/scheduler/algorithm:go_default_library",
"//pkg/util/node:go_default_library",
"//pkg/util/node:go_default_library",
"//pkg/util/taints:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/api/core/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
...
...
pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go
View file @
39a33b1b
...
@@ -41,7 +41,9 @@ import (
...
@@ -41,7 +41,9 @@ import (
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/cloudprovider/providers/gce"
"k8s.io/kubernetes/pkg/controller"
"k8s.io/kubernetes/pkg/controller"
nodeutil
"k8s.io/kubernetes/pkg/controller/util/node"
nodeutil
"k8s.io/kubernetes/pkg/controller/util/node"
"k8s.io/kubernetes/pkg/scheduler/algorithm"
utilnode
"k8s.io/kubernetes/pkg/util/node"
utilnode
"k8s.io/kubernetes/pkg/util/node"
utiltaints
"k8s.io/kubernetes/pkg/util/taints"
)
)
// cloudCIDRAllocator allocates node CIDRs according to IP address aliases
// cloudCIDRAllocator allocates node CIDRs according to IP address aliases
...
@@ -108,8 +110,9 @@ func NewCloudCIDRAllocator(client clientset.Interface, cloud cloudprovider.Inter
...
@@ -108,8 +110,9 @@ func NewCloudCIDRAllocator(client clientset.Interface, cloud cloudprovider.Inter
}
}
// Even if PodCIDR is assigned, but NetworkUnavailable condition is
// Even if PodCIDR is assigned, but NetworkUnavailable condition is
// set to true, we need to process the node to set the condition.
// set to true, we need to process the node to set the condition.
networkUnavailableTaint
:=
&
v1
.
Taint
{
Key
:
algorithm
.
TaintNodeNetworkUnavailable
,
Effect
:
v1
.
TaintEffectNoSchedule
}
_
,
cond
:=
v1node
.
GetNodeCondition
(
&
newNode
.
Status
,
v1
.
NodeNetworkUnavailable
)
_
,
cond
:=
v1node
.
GetNodeCondition
(
&
newNode
.
Status
,
v1
.
NodeNetworkUnavailable
)
if
cond
==
nil
||
cond
.
Status
!=
v1
.
ConditionFalse
{
if
cond
==
nil
||
cond
.
Status
!=
v1
.
ConditionFalse
||
!
utiltaints
.
TaintExists
(
newNode
.
Spec
.
Taints
,
networkUnavailableTaint
)
{
return
ca
.
AllocateOrOccupyCIDR
(
newNode
)
return
ca
.
AllocateOrOccupyCIDR
(
newNode
)
}
}
return
nil
return
nil
...
...
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