mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-08-05 10:10:16 +00:00
f451aa0762
Migrate the kubelet (and the kube-proxy conntrack helper) off the full github.com/google/cadvisor module onto the lean github.com/google/cadvisor/lib: repoint info/v1+info/v2 type usage to lib/model and the manager/fs/cache/etc. consumers to lib/*; regenerate the cadvisor.Interface mocks; keep the kubelet-pinned cAdvisor global flags via lib/cadvisorflags. go.mod: require + replace github.com/google/cadvisor/lib (=> the dims/cadvisor/lib fork for now, until lib is tagged) and drop the full github.com/google/cadvisor module entirely; keep github.com/containerd/containerd/api at v1.11.0 (matching upstream master); add github.com/google/cadvisor to unwanted-dependencies.json unwantedModules so the full module cannot be re-vendored. test/e2e_node: the one remaining consumer of the full module -- the node-e2e ResourceCollector, which used the v2 HTTP client (client/v2) + v2 API types (info/v2) -- now scrapes the standalone cAdvisor pod's /api/v2.1/stats directly over HTTP+JSON, so test/e2e_node depends on no cAdvisor package. No change to the kubelet's stats surfaces.
90 lines
4.0 KiB
Go
90 lines
4.0 KiB
Go
// Copyright 2024 Google Inc. All Rights Reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package manager
|
|
|
|
import (
|
|
"time"
|
|
|
|
"github.com/google/cadvisor/lib/container"
|
|
info "github.com/google/cadvisor/lib/model"
|
|
"github.com/google/cadvisor/lib/stats"
|
|
)
|
|
|
|
// Collector-manager injection seam.
|
|
//
|
|
// The kubelet-only library does not import the perf_event / resctrl
|
|
// implementations (or their dependencies). Instead, the full cAdvisor binary
|
|
// registers factories here at init time; when a factory is nil (the kubelet
|
|
// case) the manager falls back to a Noop manager, so no stats are collected for
|
|
// that controller. This keeps github.com/google/cadvisor/lib lean while letting
|
|
// the binary remain fully functional.
|
|
var (
|
|
// PerfManagerFactory builds the perf_event stats manager. Set by the root
|
|
// binary to perf.NewManager.
|
|
PerfManagerFactory func(configFile string, topology []info.Node) (stats.Manager, error)
|
|
|
|
// ResctrlManagerFactory builds the resctrl stats manager. Set by the root
|
|
// binary to resctrl.NewManager.
|
|
ResctrlManagerFactory func(interval time.Duration, vendorID string, inHostNamespace bool) (stats.ResctrlManager, error)
|
|
)
|
|
|
|
// SummaryReader computes rolling-window derived/percentile usage stats for a
|
|
// single container. The full binary injects a reader backed by the summary
|
|
// package; the kubelet leaves SummaryReaderFactory nil and no derived stats are
|
|
// produced (GetDerivedStats reports "not enabled").
|
|
type SummaryReader interface {
|
|
AddSample(stat info.ContainerStats) error
|
|
DerivedStats() (info.DerivedStats, error)
|
|
}
|
|
|
|
// SummaryReaderFactory builds a per-container summary reader from its spec. Set
|
|
// by the root binary (wrapping summary.New).
|
|
var SummaryReaderFactory func(spec info.ContainerSpec) (SummaryReader, error)
|
|
|
|
// ProcessListProvider lists the processes running in a container (the v2 /ps
|
|
// endpoint). containerName is the container's cgroup name; isRoot reports
|
|
// whether it is the root container. Set by the root binary to a ps-based
|
|
// implementation; nil for the kubelet (GetProcessList returns empty).
|
|
var ProcessListProvider func(containerName string, isRoot bool, cadvisorContainer string, inHostNamespace bool) ([]info.ProcessInfo, error)
|
|
|
|
// CollectorManager runs application-metrics collectors for one container and
|
|
// aggregates their custom metrics. The full binary injects a manager backed by
|
|
// the collector package; the kubelet leaves CollectorManagerFactory nil (no
|
|
// custom metrics).
|
|
type CollectorManager interface {
|
|
Collect() (time.Time, map[string][]info.MetricVal, error)
|
|
GetSpec() ([]info.MetricSpec, error)
|
|
}
|
|
|
|
// CollectorManagerFactory builds a per-container collector manager. It receives
|
|
// the container handler (to discover collector configs from its labels) and a
|
|
// readFile func (to read those config files from inside the container). Set by
|
|
// the root binary.
|
|
var CollectorManagerFactory func(handler container.ContainerHandler, readFile func(string) ([]byte, error)) (CollectorManager, error)
|
|
|
|
// CpuLoadReader reads per-container CPU load over netlink (runnable/uninterruptible
|
|
// task counts). The implementation lives in the root binary's utils/cpuload
|
|
// (CAP_NET_ADMIN, a persistent netlink connection); the kubelet leaves
|
|
// CpuLoadReaderFactory nil so no reader is created and LoadAverage stays zero.
|
|
type CpuLoadReader interface {
|
|
Start() error
|
|
Stop()
|
|
GetCpuLoad(name string, path string) (info.LoadStats, error)
|
|
}
|
|
|
|
// CpuLoadReaderFactory builds a CpuLoadReader. Set by the root binary when
|
|
// --enable_load_reader is on; nil for the kubelet.
|
|
var CpuLoadReaderFactory func() (CpuLoadReader, error)
|