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
2320fde4
Commit
2320fde4
authored
Apr 19, 2017
by
Daniel Nardo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update kubelet to use the network-plugin-dir if the cni-bin-dir flag
is not set.
parent
d1f4664f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
plugins.go
cmd/kubelet/app/plugins.go
+7
-2
No files found.
cmd/kubelet/app/plugins.go
View file @
2320fde4
...
@@ -106,9 +106,14 @@ func ProbeNetworkPlugins(pluginDir, cniConfDir, cniBinDir string) []network.Netw
...
@@ -106,9 +106,14 @@ func ProbeNetworkPlugins(pluginDir, cniConfDir, cniBinDir string) []network.Netw
if
cniConfDir
==
""
{
if
cniConfDir
==
""
{
cniConfDir
=
pluginDir
cniConfDir
=
pluginDir
}
}
binDir
:=
cniBinDir
if
binDir
==
""
{
binDir
=
pluginDir
}
// for each existing plugin, add to the list
// for each existing plugin, add to the list
allPlugins
=
append
(
allPlugins
,
cni
.
ProbeNetworkPlugins
(
cniConfDir
,
cniB
inDir
)
...
)
allPlugins
=
append
(
allPlugins
,
cni
.
ProbeNetworkPlugins
(
cniConfDir
,
b
inDir
)
...
)
allPlugins
=
append
(
allPlugins
,
kubenet
.
NewPlugin
(
plug
inDir
))
allPlugins
=
append
(
allPlugins
,
kubenet
.
NewPlugin
(
b
inDir
))
return
allPlugins
return
allPlugins
}
}
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