github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 13:45:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #52297 from derekwaynecarr/code-hygiene

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 51041, 52297, 52296, 52335, 52338)

Use cAdvisor constant for crio imagefs

**What this PR does / why we need it**:
code hygiene to use a constant from cAdvisor

**Release note**:
```release-note
NONE
```
This commit is contained in:
Kubernetes Submit Queue
2017-09-12 11:10:10 -07:00
committed by GitHub
parent a63e3deec3 cf2c688385
commit 8e95e39c15
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/cadvisor/helpers_linux.go
View File

@@ -40,9 +40,8 @@ func (i *imageFsInfoProvider) ImageFsInfoLabel() (string, error) {
case "rkt":
return cadvisorfs.LabelRktImages, nil
case "remote":
// TODO: pending rebase including https://github.com/google/cadvisor/pull/1741
if i.runtimeEndpoint == "/var/run/crio.sock" {
return "crio-images", nil
return cadvisorfs.LabelCrioImages, nil
}
}
return "", fmt.Errorf("no imagefs label for configured runtime")