mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 21:37:23 +00:00
Switch the CRI integration layer from containerd's forked Kubernetes helpers and clients to the upstream Kubernetes modules, and finalize the dependency update to Kubernetes v0.36.0. Replace the remaining internal helper copies with upstream packages: - internal/cri/clock -> k8s.io/utils/clock - internal/cri/executil -> upstream CRI exec helpers - internal/cri/resourcequantity -> k8s.io/apimachinery/pkg/api/resource - internal/cri/setutils -> k8s.io/apimachinery/pkg/util/sets - internal/cri/types/labels.go -> internal/cri/labels - integration/cri-api/pkg/apis/services.go -> k8s.io/cri-api/pkg/apis/services.go Adopt the upstream CRI clients directly: - add k8s.io/cri-client v0.36.0, k8s.io/cri-streaming v0.36.0, and k8s.io/streaming v0.36.0 as direct dependencies - promote k8s.io/utils to a direct dependency and pull in k8s.io/component-base v0.36.0 indirectly - keep integration/remote as a thin containerd adapter around cri-client, because the integration tests still need the stream-shaped GetContainerEvents RPC Finalize the Kubernetes dependency update from v0.36.0-rc.0 to v0.36.0, refresh vendor/, and drop the obsolete internal utility copies. Also fix the protobuf MessageState mutex-copy vet failures exposed by the new APIs and close the temporary integration CRI clients explicitly. Signed-off-by: Davanum Srinivas <davanum@gmail.com>
242 lines
6.0 KiB
Go
242 lines
6.0 KiB
Go
// Copyright The Prometheus Authors
|
|
// 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 procfs
|
|
|
|
import (
|
|
"bufio"
|
|
"bytes"
|
|
"encoding/hex"
|
|
"errors"
|
|
"fmt"
|
|
"io"
|
|
"net"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/prometheus/procfs/internal/util"
|
|
)
|
|
|
|
// IPVSStats holds IPVS statistics, as exposed by the kernel in `/proc/net/ip_vs_stats`.
|
|
type IPVSStats struct {
|
|
// Total count of connections.
|
|
Connections uint64
|
|
// Total incoming packages processed.
|
|
IncomingPackets uint64
|
|
// Total outgoing packages processed.
|
|
OutgoingPackets uint64
|
|
// Total incoming traffic.
|
|
IncomingBytes uint64
|
|
// Total outgoing traffic.
|
|
OutgoingBytes uint64
|
|
}
|
|
|
|
// IPVSBackendStatus holds current metrics of one virtual / real address pair.
|
|
type IPVSBackendStatus struct {
|
|
// The local (virtual) IP address.
|
|
LocalAddress net.IP
|
|
// The remote (real) IP address.
|
|
RemoteAddress net.IP
|
|
// The local (virtual) port.
|
|
LocalPort uint16
|
|
// The remote (real) port.
|
|
RemotePort uint16
|
|
// The local firewall mark
|
|
LocalMark string
|
|
// The transport protocol (TCP, UDP).
|
|
Proto string
|
|
// The current number of active connections for this virtual/real address pair.
|
|
ActiveConn uint64
|
|
// The current number of inactive connections for this virtual/real address pair.
|
|
InactConn uint64
|
|
// The current weight of this virtual/real address pair.
|
|
Weight uint64
|
|
}
|
|
|
|
// IPVSStats reads the IPVS statistics from the specified `proc` filesystem.
|
|
func (fs FS) IPVSStats() (IPVSStats, error) {
|
|
data, err := util.ReadFileNoStat(fs.proc.Path("net/ip_vs_stats"))
|
|
if err != nil {
|
|
return IPVSStats{}, err
|
|
}
|
|
|
|
return parseIPVSStats(bytes.NewReader(data))
|
|
}
|
|
|
|
// parseIPVSStats performs the actual parsing of `ip_vs_stats`.
|
|
func parseIPVSStats(r io.Reader) (IPVSStats, error) {
|
|
var (
|
|
statContent []byte
|
|
statLines []string
|
|
statFields []string
|
|
stats IPVSStats
|
|
)
|
|
|
|
statContent, err := io.ReadAll(r)
|
|
if err != nil {
|
|
return IPVSStats{}, err
|
|
}
|
|
|
|
statLines = strings.SplitN(string(statContent), "\n", 4)
|
|
if len(statLines) != 4 {
|
|
return IPVSStats{}, errors.New("ip_vs_stats corrupt: too short")
|
|
}
|
|
|
|
statFields = strings.Fields(statLines[2])
|
|
if len(statFields) != 5 {
|
|
return IPVSStats{}, errors.New("ip_vs_stats corrupt: unexpected number of fields")
|
|
}
|
|
|
|
stats.Connections, err = strconv.ParseUint(statFields[0], 16, 64)
|
|
if err != nil {
|
|
return IPVSStats{}, err
|
|
}
|
|
stats.IncomingPackets, err = strconv.ParseUint(statFields[1], 16, 64)
|
|
if err != nil {
|
|
return IPVSStats{}, err
|
|
}
|
|
stats.OutgoingPackets, err = strconv.ParseUint(statFields[2], 16, 64)
|
|
if err != nil {
|
|
return IPVSStats{}, err
|
|
}
|
|
stats.IncomingBytes, err = strconv.ParseUint(statFields[3], 16, 64)
|
|
if err != nil {
|
|
return IPVSStats{}, err
|
|
}
|
|
stats.OutgoingBytes, err = strconv.ParseUint(statFields[4], 16, 64)
|
|
if err != nil {
|
|
return IPVSStats{}, err
|
|
}
|
|
|
|
return stats, nil
|
|
}
|
|
|
|
// IPVSBackendStatus reads and returns the status of all (virtual,real) server pairs from the specified `proc` filesystem.
|
|
func (fs FS) IPVSBackendStatus() ([]IPVSBackendStatus, error) {
|
|
file, err := os.Open(fs.proc.Path("net/ip_vs"))
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
defer file.Close()
|
|
|
|
return parseIPVSBackendStatus(file)
|
|
}
|
|
|
|
func parseIPVSBackendStatus(file io.Reader) ([]IPVSBackendStatus, error) {
|
|
var (
|
|
status []IPVSBackendStatus
|
|
scanner = bufio.NewScanner(file)
|
|
proto string
|
|
localMark string
|
|
localAddress net.IP
|
|
localPort uint16
|
|
err error
|
|
)
|
|
|
|
for scanner.Scan() {
|
|
fields := strings.Fields(scanner.Text())
|
|
if len(fields) == 0 {
|
|
continue
|
|
}
|
|
switch {
|
|
case fields[0] == "IP" || fields[0] == "Prot" || fields[1] == "RemoteAddress:Port":
|
|
continue
|
|
case fields[0] == "TCP" || fields[0] == "UDP":
|
|
if len(fields) < 2 {
|
|
continue
|
|
}
|
|
proto = fields[0]
|
|
localMark = ""
|
|
localAddress, localPort, err = parseIPPort(fields[1])
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
case fields[0] == "FWM":
|
|
if len(fields) < 2 {
|
|
continue
|
|
}
|
|
proto = fields[0]
|
|
localMark = fields[1]
|
|
localAddress = nil
|
|
localPort = 0
|
|
case fields[0] == "->":
|
|
if len(fields) < 6 {
|
|
continue
|
|
}
|
|
remoteAddress, remotePort, err := parseIPPort(fields[1])
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
weight, err := strconv.ParseUint(fields[3], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
activeConn, err := strconv.ParseUint(fields[4], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
inactConn, err := strconv.ParseUint(fields[5], 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
status = append(status, IPVSBackendStatus{
|
|
LocalAddress: localAddress,
|
|
LocalPort: localPort,
|
|
LocalMark: localMark,
|
|
RemoteAddress: remoteAddress,
|
|
RemotePort: remotePort,
|
|
Proto: proto,
|
|
Weight: weight,
|
|
ActiveConn: activeConn,
|
|
InactConn: inactConn,
|
|
})
|
|
}
|
|
}
|
|
return status, nil
|
|
}
|
|
|
|
func parseIPPort(s string) (net.IP, uint16, error) {
|
|
var (
|
|
ip net.IP
|
|
err error
|
|
)
|
|
|
|
switch len(s) {
|
|
case 13:
|
|
ip, err = hex.DecodeString(s[0:8])
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
case 46:
|
|
ip = net.ParseIP(s[1:40])
|
|
if ip == nil {
|
|
return nil, 0, fmt.Errorf("%w: Invalid IPv6 addr %s: %w", ErrFileParse, s[1:40], err)
|
|
}
|
|
default:
|
|
return nil, 0, fmt.Errorf("%w: Unexpected IP:Port %s: %w", ErrFileParse, s, err)
|
|
}
|
|
|
|
portString := s[len(s)-4:]
|
|
if len(portString) != 4 {
|
|
return nil, 0,
|
|
fmt.Errorf("%w: Unexpected port string format %s: %w", ErrFileParse, portString, err)
|
|
}
|
|
port, err := strconv.ParseUint(portString, 16, 16)
|
|
if err != nil {
|
|
return nil, 0, err
|
|
}
|
|
|
|
return ip, uint16(port), nil
|
|
}
|