github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-25 10:00:53 +00:00
Code Issues Projects Releases Wiki Activity

Update cAdvisor.

Browse Source 
Also update golang.org/x/sys because of google/cadvisor#1786
This commit is contained in:
Rohit Agarwal
2017-11-06 13:54:48 -08:00
parent dad41f8526
commit fe5ef1b494
297 changed files with 10024 additions and 8974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/github.com/google/cadvisor/container/docker/BUILD generated vendored
View File

@@ -12,9 +12,9 @@ go_library(
visibility = ["//visibility:public"],
deps = [
"//vendor/github.com/blang/semver:go_default_library",
"//vendor/github.com/docker/engine-api/client:go_default_library",
"//vendor/github.com/docker/engine-api/types:go_default_library",
"//vendor/github.com/docker/engine-api/types/container:go_default_library",
"//vendor/github.com/docker/docker/api/types:go_default_library",
"//vendor/github.com/docker/docker/api/types/container:go_default_library",
"//vendor/github.com/docker/docker/client:go_default_library",
"//vendor/github.com/docker/go-connections/tlsconfig:go_default_library",
"//vendor/github.com/golang/glog:go_default_library",
"//vendor/github.com/google/cadvisor/container:go_default_library",

2
vendor/github.com/google/cadvisor/container/docker/client.go generated vendored
View File

@@ -21,7 +21,7 @@ import (
"net/http"
"sync"
dclient "github.com/docker/engine-api/client"
dclient "github.com/docker/docker/client"
"github.com/docker/go-connections/tlsconfig"
)

11
vendor/github.com/google/cadvisor/container/docker/docker.go generated vendored
View File

@@ -19,9 +19,8 @@ import (
"fmt"
"regexp"
"strconv"
"strings"
dockertypes "github.com/docker/engine-api/types"
dockertypes "github.com/docker/docker/api/types"
"golang.org/x/net/context"
"github.com/google/cadvisor/info/v1"
@@ -49,7 +48,6 @@ func StatusFromDockerInfo(dockerInfo dockertypes.Info) v1.DockerStatus {
out.Hostname = dockerInfo.Name
out.RootDir = dockerInfo.DockerRootDir
out.Driver = dockerInfo.Driver
out.ExecDriver = dockerInfo.ExecutionDriver
out.NumImages = dockerInfo.Images
out.NumContainers = dockerInfo.Containers
out.DriverStatus = make(map[string]string, len(dockerInfo.DriverStatus))
@@ -119,13 +117,6 @@ func ValidateInfo() (*dockertypes.Info, error) {
return nil, fmt.Errorf("cAdvisor requires docker version %v or above but we have found version %v reported as %q", []int{1, 0, 0}, version, dockerInfo.ServerVersion)
}
// Check that the libcontainer execdriver is used if the version is < 1.11
// (execution drivers are no longer supported as of 1.11).
if version[0] <= 1 && version[1] <= 10 &&
!strings.HasPrefix(dockerInfo.ExecutionDriver, "native") {
return nil, fmt.Errorf("docker found, but not using native exec driver")
}
if dockerInfo.Driver == "" {
return nil, fmt.Errorf("failed to find docker storage driver")
}

4
vendor/github.com/google/cadvisor/container/docker/factory.go generated vendored
View File

@@ -24,7 +24,7 @@ import (
"sync"
"github.com/blang/semver"
dockertypes "github.com/docker/engine-api/types"
dockertypes "github.com/docker/docker/api/types"
"github.com/google/cadvisor/container"
"github.com/google/cadvisor/container/libcontainer"
"github.com/google/cadvisor/devicemapper"
@@ -35,7 +35,7 @@ import (
dockerutil "github.com/google/cadvisor/utils/docker"
"github.com/google/cadvisor/zfs"
docker "github.com/docker/engine-api/client"
docker "github.com/docker/docker/client"
"github.com/golang/glog"
"golang.org/x/net/context"
)

4
vendor/github.com/google/cadvisor/container/docker/handler.go generated vendored
View File

@@ -32,8 +32,8 @@ import (
dockerutil "github.com/google/cadvisor/utils/docker"
"github.com/google/cadvisor/zfs"
docker "github.com/docker/engine-api/client"
dockercontainer "github.com/docker/engine-api/types/container"
dockercontainer "github.com/docker/docker/api/types/container"
docker "github.com/docker/docker/client"
"github.com/golang/glog"
"github.com/opencontainers/runc/libcontainer/cgroups"
cgroupfs "github.com/opencontainers/runc/libcontainer/cgroups/fs"