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
c19965c7
Commit
c19965c7
authored
Aug 17, 2017
by
Dan Williams
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cni: print better error when a CNI .configlist is put into a .config
parent
6430b100
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
0 deletions
+7
-0
cni.go
pkg/kubelet/network/cni/cni.go
+7
-0
No files found.
pkg/kubelet/network/cni/cni.go
View file @
c19965c7
...
@@ -119,6 +119,13 @@ func getDefaultCNINetwork(pluginDir, binDir, vendorCNIDirPrefix string) (*cniNet
...
@@ -119,6 +119,13 @@ func getDefaultCNINetwork(pluginDir, binDir, vendorCNIDirPrefix string) (*cniNet
glog
.
Warningf
(
"Error loading CNI config file %s: %v"
,
confFile
,
err
)
glog
.
Warningf
(
"Error loading CNI config file %s: %v"
,
confFile
,
err
)
continue
continue
}
}
// Ensure the config has a "type" so we know what plugin to run.
// Also catches the case where somebody put a conflist into a conf file.
if
conf
.
Network
.
Type
==
""
{
glog
.
Warningf
(
"Error loading CNI config file %s: no 'type'; perhaps this is a .conflist?"
,
confFile
)
continue
}
confList
,
err
=
libcni
.
ConfListFromConf
(
conf
)
confList
,
err
=
libcni
.
ConfListFromConf
(
conf
)
if
err
!=
nil
{
if
err
!=
nil
{
glog
.
Warningf
(
"Error converting CNI config file %s to list: %v"
,
confFile
,
err
)
glog
.
Warningf
(
"Error converting CNI config file %s to list: %v"
,
confFile
,
err
)
...
...
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