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
27d80eb7
Commit
27d80eb7
authored
Oct 04, 2017
by
Yassine TIJANI
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleaning newNodeController from unsupported kubelet version
parent
7810eb8d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
15 deletions
+0
-15
node_controller.go
pkg/controller/node/node_controller.go
+0
-4
controller_utils.go
pkg/controller/node/util/controller_utils.go
+0
-11
No files found.
pkg/controller/node/node_controller.go
View file @
27d80eb7
...
@@ -186,7 +186,6 @@ type Controller struct {
...
@@ -186,7 +186,6 @@ type Controller struct {
cidrAllocator
ipam
.
CIDRAllocator
cidrAllocator
ipam
.
CIDRAllocator
taintManager
*
scheduler
.
NoExecuteTaintManager
taintManager
*
scheduler
.
NoExecuteTaintManager
forcefullyDeletePod
func
(
*
v1
.
Pod
)
error
nodeExistsInCloudProvider
func
(
types
.
NodeName
)
(
bool
,
error
)
nodeExistsInCloudProvider
func
(
types
.
NodeName
)
(
bool
,
error
)
computeZoneStateFunc
func
(
nodeConditions
[]
*
v1
.
NodeCondition
)
(
int
,
ZoneState
)
computeZoneStateFunc
func
(
nodeConditions
[]
*
v1
.
NodeCondition
)
(
int
,
ZoneState
)
enterPartialDisruptionFunc
func
(
nodeNum
int
)
float32
enterPartialDisruptionFunc
func
(
nodeNum
int
)
float32
...
@@ -285,9 +284,6 @@ func NewNodeController(
...
@@ -285,9 +284,6 @@ func NewNodeController(
serviceCIDR
:
serviceCIDR
,
serviceCIDR
:
serviceCIDR
,
allocateNodeCIDRs
:
allocateNodeCIDRs
,
allocateNodeCIDRs
:
allocateNodeCIDRs
,
allocatorType
:
allocatorType
,
allocatorType
:
allocatorType
,
forcefullyDeletePod
:
func
(
p
*
v1
.
Pod
)
error
{
return
util
.
ForcefullyDeletePod
(
kubeClient
,
p
)
},
nodeExistsInCloudProvider
:
func
(
nodeName
types
.
NodeName
)
(
bool
,
error
)
{
nodeExistsInCloudProvider
:
func
(
nodeName
types
.
NodeName
)
(
bool
,
error
)
{
return
util
.
NodeExistsInCloudProvider
(
cloud
,
nodeName
)
return
util
.
NodeExistsInCloudProvider
(
cloud
,
nodeName
)
},
},
...
...
pkg/controller/node/util/controller_utils.go
View file @
27d80eb7
...
@@ -129,17 +129,6 @@ func SetPodTerminationReason(kubeClient clientset.Interface, pod *v1.Pod, nodeNa
...
@@ -129,17 +129,6 @@ func SetPodTerminationReason(kubeClient clientset.Interface, pod *v1.Pod, nodeNa
return
updatedPod
,
nil
return
updatedPod
,
nil
}
}
// ForcefullyDeletePod deletes the pod immediately.
func
ForcefullyDeletePod
(
c
clientset
.
Interface
,
pod
*
v1
.
Pod
)
error
{
var
zero
int64
glog
.
Infof
(
"NodeController is force deleting Pod: %v:%v"
,
pod
.
Namespace
,
pod
.
Name
)
err
:=
c
.
Core
()
.
Pods
(
pod
.
Namespace
)
.
Delete
(
pod
.
Name
,
&
metav1
.
DeleteOptions
{
GracePeriodSeconds
:
&
zero
})
if
err
==
nil
{
glog
.
V
(
4
)
.
Infof
(
"forceful deletion of %s succeeded"
,
pod
.
Name
)
}
return
err
}
// ForcefullyDeleteNode deletes the node immediately. The pods on the
// ForcefullyDeleteNode deletes the node immediately. The pods on the
// node are cleaned up by the podGC.
// node are cleaned up by the podGC.
func
ForcefullyDeleteNode
(
kubeClient
clientset
.
Interface
,
nodeName
string
)
error
{
func
ForcefullyDeleteNode
(
kubeClient
clientset
.
Interface
,
nodeName
string
)
error
{
...
...
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