mirror of
https://github.com/kubernetes/kubernetes.git
synced 2026-08-05 12:50:16 +00:00
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.
56 lines
2.1 KiB
Go
56 lines
2.1 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 (
|
|
info "github.com/google/cadvisor/lib/model"
|
|
|
|
"k8s.io/klog/v2"
|
|
)
|
|
|
|
// EventSink receives the container lifecycle (creation/deletion) and OOM events
|
|
// the manager emits. The full cAdvisor binary injects its events.EventManager
|
|
// here (it satisfies this interface) and serves them over the /events REST API;
|
|
// the kubelet leaves it nil, so the manager emits nothing and the library
|
|
// carries no event-storage machinery. This is the same injection pattern as the
|
|
// perf/resctrl factories — see plugins.go.
|
|
type EventSink interface {
|
|
AddEvent(*info.Event) error
|
|
}
|
|
|
|
// SetEventSink wires an event sink. Safe to call once before Start; passing nil
|
|
// (the default) disables event emission.
|
|
func (m *manager) SetEventSink(sink EventSink) {
|
|
m.eventSink = sink
|
|
}
|
|
|
|
// addEvent delivers an event to the sink, best-effort. It is a no-op when no
|
|
// sink is wired (the kubelet case).
|
|
func (m *manager) addEvent(e *info.Event) {
|
|
if m.eventSink == nil {
|
|
return
|
|
}
|
|
if err := m.eventSink.AddEvent(e); err != nil {
|
|
klog.Errorf("failed to add %s event for %q: %v", e.EventType, e.ContainerName, err)
|
|
}
|
|
}
|
|
|
|
// EventStorageAgeLimit and EventStorageEventLimit expose the values of the
|
|
// event_storage_* flags this package registers (for kubelet flag-compatibility)
|
|
// so the root binary can build its events storage policy without re-registering
|
|
// — and double-registering — the same flags.
|
|
func EventStorageAgeLimit() string { return *eventStorageAgeLimit }
|
|
func EventStorageEventLimit() string { return *eventStorageEventLimit }
|