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
b92756e8
Unverified
Commit
b92756e8
authored
Jan 10, 2019
by
Kubernetes Prow Robot
Committed by
GitHub
Jan 10, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #72340 from makocchi-git/cadvisor_crisocket
kubelet: fixes cadvisor internal error
parents
0f50fdc5
4fe1b6f3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
helpers_linux.go
pkg/kubelet/cadvisor/helpers_linux.go
+1
-1
No files found.
pkg/kubelet/cadvisor/helpers_linux.go
View file @
b92756e8
...
...
@@ -42,7 +42,7 @@ func (i *imageFsInfoProvider) ImageFsInfoLabel() (string, error) {
// This is a temporary workaround to get stats for cri-o from cadvisor
// and should be removed.
// Related to https://github.com/kubernetes/kubernetes/issues/51798
if
i
.
runtimeEndpoint
==
CrioSocket
{
if
i
.
runtimeEndpoint
==
CrioSocket
||
i
.
runtimeEndpoint
==
"unix://"
+
CrioSocket
{
return
cadvisorfs
.
LabelCrioImages
,
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