mirror of
https://github.com/kubernetes/client-go.git
synced 2025-10-02 18:46:27 +00:00
aa671fcc5b
Automatic merge from submit-queue (batch tested with PRs 51186, 50350, 51751, 51645, 51837) Update Cadvisor Dependency Fixes: https://github.com/kubernetes/kubernetes/issues/51832 This is the worst dependency update ever... The root of the problem is the [name change of Sirupsen -> sirupsen](https://github.com/sirupsen/logrus/issues/570#issuecomment-313933276). This means that in order to update cadvisor, which venders the lowercase, we need to update all dependencies to use the lower-cased version. With that being said, this PR updates the following packages: `github.com/docker/docker` - `github.com/docker/distribution` - `github.com/opencontainers/go-digest` - `github.com/opencontainers/image-spec` - `github.com/opencontainers/runtime-spec` - `github.com/opencontainers/selinux` - `github.com/opencontainers/runc` - `github.com/mrunalp/fileutils` - `golang.org/x/crypto` - `golang.org/x/sys` - `github.com/docker/go-connections` - `github.com/docker/go-units` - `github.com/docker/libnetwork` - `github.com/docker/libtrust` - `github.com/sirupsen/logrus` - `github.com/vishvananda/netlink` `github.com/google/cadvisor` - `github.com/euank/go-kmsg-parser` `github.com/json-iterator/go` Fixed https://github.com/kubernetes/kubernetes/issues/51832 ```release-note Fix journalctl leak on kubelet restart Fix container memory rss Add hugepages monitoring support Fix incorrect CPU usage metrics with 4.7 kernel Add tmpfs monitoring support ``` Kubernetes-commit: 99aa992ce845fe947a406ac4d3f99d2208f0416b
43 lines
1.5 KiB
Go
43 lines
1.5 KiB
Go
// Copyright 2017 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// Functions to access/create device major and minor numbers matching the
|
|
// encoding used by the Linux kernel and glibc.
|
|
//
|
|
// The information below is extracted and adapted from bits/sysmacros.h in the
|
|
// glibc sources:
|
|
//
|
|
// dev_t in glibc is 64-bit, with 32-bit major and minor numbers. glibc's
|
|
// default encoding is MMMM Mmmm mmmM MMmm, where M is a hex digit of the major
|
|
// number and m is a hex digit of the minor number. This is backward compatible
|
|
// with legacy systems where dev_t is 16 bits wide, encoded as MMmm. It is also
|
|
// backward compatible with the Linux kernel, which for some architectures uses
|
|
// 32-bit dev_t, encoded as mmmM MMmm.
|
|
|
|
package unix
|
|
|
|
// Major returns the major component of a Linux device number.
|
|
func Major(dev uint64) uint32 {
|
|
major := uint32((dev & 0x00000000000fff00) >> 8)
|
|
major |= uint32((dev & 0xfffff00000000000) >> 32)
|
|
return major
|
|
}
|
|
|
|
// Minor returns the minor component of a Linux device number.
|
|
func Minor(dev uint64) uint32 {
|
|
minor := uint32((dev & 0x00000000000000ff) >> 0)
|
|
minor |= uint32((dev & 0x00000ffffff00000) >> 12)
|
|
return minor
|
|
}
|
|
|
|
// Mkdev returns a Linux device number generated from the given major and minor
|
|
// components.
|
|
func Mkdev(major, minor uint32) uint64 {
|
|
dev := uint64((major & 0x00000fff) << 8)
|
|
dev |= uint64((major & 0xfffff000) << 32)
|
|
dev |= uint64((minor & 0x000000ff) << 0)
|
|
dev |= uint64((minor & 0xffffff00) << 12)
|
|
return dev
|
|
}
|