mirror of
				https://github.com/k3s-io/kubernetes.git
				synced 2025-11-04 07:49:35 +00:00 
			
		
		
		
	update cadvisor godeps to v0.27.2
This commit is contained in:
		
							
								
								
									
										7
									
								
								vendor/github.com/google/cadvisor/container/crio/handler.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/github.com/google/cadvisor/container/crio/handler.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -18,6 +18,7 @@ package crio
 | 
			
		||||
import (
 | 
			
		||||
	"fmt"
 | 
			
		||||
	"path"
 | 
			
		||||
	"path/filepath"
 | 
			
		||||
	"strconv"
 | 
			
		||||
	"strings"
 | 
			
		||||
	"time"
 | 
			
		||||
@@ -142,6 +143,12 @@ func newCrioContainerHandler(
 | 
			
		||||
	// get device ID from root, otherwise, it's going to error out as overlay
 | 
			
		||||
	// mounts doesn't have fixed dev ids.
 | 
			
		||||
	rootfsStorageDir = strings.TrimSuffix(rootfsStorageDir, "/merged")
 | 
			
		||||
	switch storageDriver {
 | 
			
		||||
	case overlayStorageDriver, overlay2StorageDriver:
 | 
			
		||||
		// overlay and overlay2 driver are the same "overlay2" driver so treat
 | 
			
		||||
		// them the same.
 | 
			
		||||
		rootfsStorageDir = filepath.Join(rootfsStorageDir, "diff")
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	// TODO: extract object mother method
 | 
			
		||||
	handler := &crioContainerHandler{
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										7
									
								
								vendor/github.com/google/cadvisor/container/docker/handler.go
									
									
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										7
									
								
								vendor/github.com/google/cadvisor/container/docker/handler.go
									
									
									
										generated
									
									
										vendored
									
									
								
							@@ -43,7 +43,8 @@ import (
 | 
			
		||||
 | 
			
		||||
const (
 | 
			
		||||
	// The read write layers exist here.
 | 
			
		||||
	aufsRWLayer = "diff"
 | 
			
		||||
	aufsRWLayer     = "diff"
 | 
			
		||||
	overlay2RWLayer = "diff"
 | 
			
		||||
 | 
			
		||||
	// Path to the directory where docker stores log files if the json logging driver is enabled.
 | 
			
		||||
	pathToContainersDir = "containers"
 | 
			
		||||
@@ -195,8 +196,10 @@ func newDockerContainerHandler(
 | 
			
		||||
	switch storageDriver {
 | 
			
		||||
	case aufsStorageDriver:
 | 
			
		||||
		rootfsStorageDir = path.Join(storageDir, string(aufsStorageDriver), aufsRWLayer, rwLayerID)
 | 
			
		||||
	case overlayStorageDriver, overlay2StorageDriver:
 | 
			
		||||
	case overlayStorageDriver:
 | 
			
		||||
		rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID)
 | 
			
		||||
	case overlay2StorageDriver:
 | 
			
		||||
		rootfsStorageDir = path.Join(storageDir, string(storageDriver), rwLayerID, overlay2RWLayer)
 | 
			
		||||
	case zfsStorageDriver:
 | 
			
		||||
		status, err := Status()
 | 
			
		||||
		if err != nil {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user