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>
127 lines
3.0 KiB
Go
127 lines
3.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 util
|
|
|
|
import (
|
|
"errors"
|
|
"os"
|
|
"strconv"
|
|
"strings"
|
|
)
|
|
|
|
// ParseUint32s parses a slice of strings into a slice of uint32s.
|
|
func ParseUint32s(ss []string) ([]uint32, error) {
|
|
us := make([]uint32, 0, len(ss))
|
|
for _, s := range ss {
|
|
u, err := strconv.ParseUint(s, 10, 32)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
us = append(us, uint32(u))
|
|
}
|
|
|
|
return us, nil
|
|
}
|
|
|
|
// ParseUint64s parses a slice of strings into a slice of uint64s.
|
|
func ParseUint64s(ss []string) ([]uint64, error) {
|
|
us := make([]uint64, 0, len(ss))
|
|
for _, s := range ss {
|
|
u, err := strconv.ParseUint(s, 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
us = append(us, u)
|
|
}
|
|
|
|
return us, nil
|
|
}
|
|
|
|
// ParsePInt64s parses a slice of strings into a slice of int64 pointers.
|
|
func ParsePInt64s(ss []string) ([]*int64, error) {
|
|
us := make([]*int64, 0, len(ss))
|
|
for _, s := range ss {
|
|
u, err := strconv.ParseInt(s, 10, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
us = append(us, &u)
|
|
}
|
|
|
|
return us, nil
|
|
}
|
|
|
|
// Parses a uint64 from given hex in string.
|
|
func ParseHexUint64s(ss []string) ([]*uint64, error) {
|
|
us := make([]*uint64, 0, len(ss))
|
|
for _, s := range ss {
|
|
u, err := strconv.ParseUint(s, 16, 64)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
us = append(us, &u)
|
|
}
|
|
|
|
return us, nil
|
|
}
|
|
|
|
// ReadUintFromFile reads a file and attempts to parse a uint64 from it.
|
|
func ReadUintFromFile(path string) (uint64, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
return strconv.ParseUint(strings.TrimSpace(string(data)), 10, 64)
|
|
}
|
|
|
|
// ReadIntFromFile reads a file and attempts to parse a int64 from it.
|
|
func ReadIntFromFile(path string) (int64, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
return strconv.ParseInt(strings.TrimSpace(string(data)), 10, 64)
|
|
}
|
|
|
|
// ParseBool parses a string into a boolean pointer.
|
|
func ParseBool(b string) *bool {
|
|
var truth bool
|
|
switch b {
|
|
case "enabled":
|
|
truth = true
|
|
case "disabled":
|
|
truth = false
|
|
default:
|
|
return nil
|
|
}
|
|
return &truth
|
|
}
|
|
|
|
// ReadHexFromFile reads a file and attempts to parse a uint64 from a hexadecimal format 0xXX.
|
|
func ReadHexFromFile(path string) (uint64, error) {
|
|
data, err := os.ReadFile(path)
|
|
if err != nil {
|
|
return 0, err
|
|
}
|
|
hexString := strings.TrimSpace(string(data))
|
|
if !strings.HasPrefix(hexString, "0x") {
|
|
return 0, errors.New("invalid format: hex string does not start with '0x'")
|
|
}
|
|
return strconv.ParseUint(hexString[2:], 16, 64)
|
|
}
|