Merge pull request #52297 from derekwaynecarr/code-hygiene

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 ```

Merge pull request #52297 from derekwaynecarr/code-hygiene
8e95e39c · Kubernetes Submit Queue · GitHub · a63e3dee · cf2c6883 · 8e95e39c
Commit 8e95e39c authored Sep 12, 2017 by Kubernetes Submit Queue Committed by GitHub Sep 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 2 deletions

helpers_linux.go pkg/kubelet/cadvisor/helpers_linux.go +1 -2

No files found.
--- a/pkg/kubelet/cadvisor/helpers_linux.go
+++ b/pkg/kubelet/cadvisor/helpers_linux.go
@@ -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")