mirror of
https://github.com/containerd/containerd.git
synced 2026-11-06 13:27:16 +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>
63 lines
1.6 KiB
Go
63 lines
1.6 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 (
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/prometheus/procfs/internal/util"
|
|
)
|
|
|
|
// LoadAvg represents an entry in /proc/loadavg.
|
|
type LoadAvg struct {
|
|
Load1 float64
|
|
Load5 float64
|
|
Load15 float64
|
|
}
|
|
|
|
// LoadAvg returns loadavg from /proc.
|
|
func (fs FS) LoadAvg() (*LoadAvg, error) {
|
|
path := fs.proc.Path("loadavg")
|
|
|
|
data, err := util.ReadFileNoStat(path)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return parseLoad(data)
|
|
}
|
|
|
|
// Parse /proc loadavg and return 1m, 5m and 15m.
|
|
func parseLoad(loadavgBytes []byte) (*LoadAvg, error) {
|
|
loads := make([]float64, 3)
|
|
parts := strings.Fields(string(loadavgBytes))
|
|
if len(parts) < 3 {
|
|
return nil, fmt.Errorf("%w: Malformed line %q", ErrFileParse, string(loadavgBytes))
|
|
}
|
|
|
|
var err error
|
|
for i, load := range parts[0:3] {
|
|
loads[i], err = strconv.ParseFloat(load, 64)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("%w: Cannot parse load: %f: %w", ErrFileParse, loads[i], err)
|
|
}
|
|
}
|
|
return &LoadAvg{
|
|
Load1: loads[0],
|
|
Load5: loads[1],
|
|
Load15: loads[2],
|
|
}, nil
|
|
}
|