mirror of
https://github.com/ceph/ceph-csi.git
synced 2025-06-14 02:43:36 +00:00
rebase: bump k8s.io/kubernetes in the k8s-dependencies group
Bumps the k8s-dependencies group with 1 update: [k8s.io/kubernetes](https://github.com/kubernetes/kubernetes). Updates `k8s.io/kubernetes` from 1.32.3 to 1.33.0 - [Release notes](https://github.com/kubernetes/kubernetes/releases) - [Commits](https://github.com/kubernetes/kubernetes/compare/v1.32.3...v1.33.0) --- updated-dependencies: - dependency-name: k8s.io/kubernetes dependency-version: 1.33.0 dependency-type: direct:production update-type: version-update:semver-minor dependency-group: k8s-dependencies ... Signed-off-by: dependabot[bot] <support@github.com> Signed-off-by: Niels de Vos <ndevos@ibm.com>
This commit is contained in:
committed by
mergify[bot]
parent
4147d5d15a
commit
51895f8619
174
vendor/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/collections.go
generated
vendored
Normal file
174
vendor/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/collections.go
generated
vendored
Normal file
@ -0,0 +1,174 @@
|
||||
/*
|
||||
Copyright 2025 The Kubernetes 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 protobuf
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"io"
|
||||
"math/bits"
|
||||
|
||||
"github.com/gogo/protobuf/proto"
|
||||
|
||||
"k8s.io/apimachinery/pkg/api/meta"
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/conversion"
|
||||
"k8s.io/apimachinery/pkg/runtime"
|
||||
)
|
||||
|
||||
var (
|
||||
errFieldCount = errors.New("expected ListType to have 3 fields")
|
||||
errTypeMetaField = errors.New("expected TypeMeta field to have TypeMeta type")
|
||||
errTypeMetaProtobufTag = errors.New(`expected TypeMeta protobuf field tag to be ""`)
|
||||
errListMetaField = errors.New("expected ListMeta field to have ListMeta type")
|
||||
errListMetaProtobufTag = errors.New(`expected ListMeta protobuf field tag to be "bytes,1,opt,name=metadata"`)
|
||||
errItemsProtobufTag = errors.New(`expected Items protobuf field tag to be "bytes,2,rep,name=items"`)
|
||||
errItemsSizer = errors.New(`expected Items elements to implement proto.Sizer`)
|
||||
)
|
||||
|
||||
// getStreamingListData implements list extraction logic for protobuf stream serialization.
|
||||
//
|
||||
// Reason for a custom logic instead of reusing accessors from meta package:
|
||||
// * Validate proto tags to prevent incompatibility with proto standard package.
|
||||
// * ListMetaAccessor doesn't distinguish empty from nil value.
|
||||
// * TypeAccessor reparsing "apiVersion" and serializing it with "{group}/{version}"
|
||||
func getStreamingListData(list runtime.Object) (data streamingListData, err error) {
|
||||
listValue, err := conversion.EnforcePtr(list)
|
||||
if err != nil {
|
||||
return data, err
|
||||
}
|
||||
listType := listValue.Type()
|
||||
if listType.NumField() != 3 {
|
||||
return data, errFieldCount
|
||||
}
|
||||
// TypeMeta: validated, but not returned as is not serialized.
|
||||
_, ok := listValue.Field(0).Interface().(metav1.TypeMeta)
|
||||
if !ok {
|
||||
return data, errTypeMetaField
|
||||
}
|
||||
if listType.Field(0).Tag.Get("protobuf") != "" {
|
||||
return data, errTypeMetaProtobufTag
|
||||
}
|
||||
// ListMeta
|
||||
listMeta, ok := listValue.Field(1).Interface().(metav1.ListMeta)
|
||||
if !ok {
|
||||
return data, errListMetaField
|
||||
}
|
||||
// if we were ever to relax the protobuf tag check we should update the hardcoded `0xa` below when writing ListMeta.
|
||||
if listType.Field(1).Tag.Get("protobuf") != "bytes,1,opt,name=metadata" {
|
||||
return data, errListMetaProtobufTag
|
||||
}
|
||||
data.listMeta = listMeta
|
||||
// Items; if we were ever to relax the protobuf tag check we should update the hardcoded `0x12` below when writing Items.
|
||||
if listType.Field(2).Tag.Get("protobuf") != "bytes,2,rep,name=items" {
|
||||
return data, errItemsProtobufTag
|
||||
}
|
||||
items, err := meta.ExtractList(list)
|
||||
if err != nil {
|
||||
return data, err
|
||||
}
|
||||
data.items = items
|
||||
data.totalSize, data.listMetaSize, data.itemsSizes, err = listSize(listMeta, items)
|
||||
return data, err
|
||||
}
|
||||
|
||||
type streamingListData struct {
|
||||
// totalSize is the total size of the serialized List object, including their proto headers/size bytes
|
||||
totalSize int
|
||||
|
||||
// listMetaSize caches results from .Size() call to listMeta, doesn't include header bytes (field identifier, size)
|
||||
listMetaSize int
|
||||
listMeta metav1.ListMeta
|
||||
|
||||
// itemsSizes caches results from .Size() call to items, doesn't include header bytes (field identifier, size)
|
||||
itemsSizes []int
|
||||
items []runtime.Object
|
||||
}
|
||||
|
||||
// listSize return size of ListMeta and items to be later used for preallocations.
|
||||
// listMetaSize and itemSizes do not include header bytes (field identifier, size).
|
||||
func listSize(listMeta metav1.ListMeta, items []runtime.Object) (totalSize, listMetaSize int, itemSizes []int, err error) {
|
||||
// ListMeta
|
||||
listMetaSize = listMeta.Size()
|
||||
totalSize += 1 + sovGenerated(uint64(listMetaSize)) + listMetaSize
|
||||
// Items
|
||||
itemSizes = make([]int, len(items))
|
||||
for i, item := range items {
|
||||
sizer, ok := item.(proto.Sizer)
|
||||
if !ok {
|
||||
return totalSize, listMetaSize, nil, errItemsSizer
|
||||
}
|
||||
n := sizer.Size()
|
||||
itemSizes[i] = n
|
||||
totalSize += 1 + sovGenerated(uint64(n)) + n
|
||||
}
|
||||
return totalSize, listMetaSize, itemSizes, nil
|
||||
}
|
||||
|
||||
func streamingEncodeUnknownList(w io.Writer, unk runtime.Unknown, listData streamingListData, memAlloc runtime.MemoryAllocator) error {
|
||||
_, err := w.Write(protoEncodingPrefix)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
// encodeList is responsible for encoding the List into the unknown Raw.
|
||||
encodeList := func(writer io.Writer) (int, error) {
|
||||
return streamingEncodeList(writer, listData, memAlloc)
|
||||
}
|
||||
_, err = unk.MarshalToWriter(w, listData.totalSize, encodeList)
|
||||
return err
|
||||
}
|
||||
|
||||
func streamingEncodeList(w io.Writer, listData streamingListData, memAlloc runtime.MemoryAllocator) (size int, err error) {
|
||||
// ListMeta; 0xa = (1 << 3) | 2; field number: 1, type: 2 (LEN). https://protobuf.dev/programming-guides/encoding/#structure
|
||||
n, err := doEncodeWithHeader(&listData.listMeta, w, 0xa, listData.listMetaSize, memAlloc)
|
||||
size += n
|
||||
if err != nil {
|
||||
return size, err
|
||||
}
|
||||
// Items; 0x12 = (2 << 3) | 2; field number: 2, type: 2 (LEN). https://protobuf.dev/programming-guides/encoding/#structure
|
||||
for i, item := range listData.items {
|
||||
n, err := doEncodeWithHeader(item, w, 0x12, listData.itemsSizes[i], memAlloc)
|
||||
size += n
|
||||
if err != nil {
|
||||
return size, err
|
||||
}
|
||||
}
|
||||
return size, nil
|
||||
}
|
||||
|
||||
func writeVarintGenerated(w io.Writer, v int) (int, error) {
|
||||
buf := make([]byte, sovGenerated(uint64(v)))
|
||||
encodeVarintGenerated(buf, len(buf), uint64(v))
|
||||
return w.Write(buf)
|
||||
}
|
||||
|
||||
// sovGenerated is copied from `generated.pb.go` returns size of varint.
|
||||
func sovGenerated(v uint64) int {
|
||||
return (bits.Len64(v|1) + 6) / 7
|
||||
}
|
||||
|
||||
// encodeVarintGenerated is copied from `generated.pb.go` encodes varint.
|
||||
func encodeVarintGenerated(dAtA []byte, offset int, v uint64) int {
|
||||
offset -= sovGenerated(v)
|
||||
base := offset
|
||||
for v >= 1<<7 {
|
||||
dAtA[offset] = uint8(v&0x7f | 0x80)
|
||||
v >>= 7
|
||||
offset++
|
||||
}
|
||||
dAtA[offset] = uint8(v)
|
||||
return base
|
||||
}
|
2
vendor/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/doc.go
generated
vendored
2
vendor/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/doc.go
generated
vendored
@ -15,4 +15,4 @@ limitations under the License.
|
||||
*/
|
||||
|
||||
// Package protobuf provides a Kubernetes serializer for the protobuf format.
|
||||
package protobuf // import "k8s.io/apimachinery/pkg/runtime/serializer/protobuf"
|
||||
package protobuf
|
||||
|
87
vendor/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/protobuf.go
generated
vendored
87
vendor/k8s.io/apimachinery/pkg/runtime/serializer/protobuf/protobuf.go
generated
vendored
@ -72,10 +72,18 @@ func IsNotMarshalable(err error) bool {
|
||||
// is passed, the encoded object will have group, version, and kind fields set. If typer is nil, the objects will be written
|
||||
// as-is (any type info passed with the object will be used).
|
||||
func NewSerializer(creater runtime.ObjectCreater, typer runtime.ObjectTyper) *Serializer {
|
||||
return NewSerializerWithOptions(creater, typer, SerializerOptions{})
|
||||
}
|
||||
|
||||
// NewSerializerWithOptions creates a Protobuf serializer that handles encoding versioned objects into the proper wire form. If a typer
|
||||
// is passed, the encoded object will have group, version, and kind fields set. If typer is nil, the objects will be written
|
||||
// as-is (any type info passed with the object will be used).
|
||||
func NewSerializerWithOptions(creater runtime.ObjectCreater, typer runtime.ObjectTyper, opts SerializerOptions) *Serializer {
|
||||
return &Serializer{
|
||||
prefix: protoEncodingPrefix,
|
||||
creater: creater,
|
||||
typer: typer,
|
||||
options: opts,
|
||||
}
|
||||
}
|
||||
|
||||
@ -84,6 +92,14 @@ type Serializer struct {
|
||||
prefix []byte
|
||||
creater runtime.ObjectCreater
|
||||
typer runtime.ObjectTyper
|
||||
|
||||
options SerializerOptions
|
||||
}
|
||||
|
||||
// SerializerOptions holds the options which are used to configure a Proto serializer.
|
||||
type SerializerOptions struct {
|
||||
// StreamingCollectionsEncoding enables encoding collection, one item at the time, drastically reducing memory needed.
|
||||
StreamingCollectionsEncoding bool
|
||||
}
|
||||
|
||||
var _ runtime.Serializer = &Serializer{}
|
||||
@ -209,6 +225,13 @@ func (s *Serializer) doEncode(obj runtime.Object, w io.Writer, memAlloc runtime.
|
||||
},
|
||||
}
|
||||
}
|
||||
if s.options.StreamingCollectionsEncoding {
|
||||
listData, err := getStreamingListData(obj)
|
||||
if err == nil {
|
||||
// Doesn't honor custom proto marshaling methods (like json streaming), because all proto objects implement proto methods.
|
||||
return streamingEncodeUnknownList(w, unk, listData, memAlloc)
|
||||
}
|
||||
}
|
||||
|
||||
switch t := obj.(type) {
|
||||
case bufferedMarshaller:
|
||||
@ -428,6 +451,39 @@ func (s *RawSerializer) encode(obj runtime.Object, w io.Writer, memAlloc runtime
|
||||
}
|
||||
|
||||
func (s *RawSerializer) doEncode(obj runtime.Object, w io.Writer, memAlloc runtime.MemoryAllocator) error {
|
||||
_, err := doEncode(obj, w, nil, memAlloc)
|
||||
return err
|
||||
}
|
||||
|
||||
func doEncodeWithHeader(obj any, w io.Writer, field byte, precomputedSize int, memAlloc runtime.MemoryAllocator) (size int, err error) {
|
||||
// Field identifier
|
||||
n, err := w.Write([]byte{field})
|
||||
size += n
|
||||
if err != nil {
|
||||
return size, err
|
||||
}
|
||||
// Size
|
||||
n, err = writeVarintGenerated(w, precomputedSize)
|
||||
size += n
|
||||
if err != nil {
|
||||
return size, err
|
||||
}
|
||||
// Obj
|
||||
n, err = doEncode(obj, w, &precomputedSize, memAlloc)
|
||||
size += n
|
||||
if err != nil {
|
||||
return size, err
|
||||
}
|
||||
if n != precomputedSize {
|
||||
return size, fmt.Errorf("the size value was %d, but doEncode wrote %d bytes to data", precomputedSize, n)
|
||||
}
|
||||
return size, nil
|
||||
}
|
||||
|
||||
// doEncode encodes provided object into writer using a allocator if possible.
|
||||
// Avoids call by object Size if precomputedObjSize is provided.
|
||||
// precomputedObjSize should not include header bytes (field identifier, size).
|
||||
func doEncode(obj any, w io.Writer, precomputedObjSize *int, memAlloc runtime.MemoryAllocator) (int, error) {
|
||||
if memAlloc == nil {
|
||||
klog.Error("a mandatory memory allocator wasn't provided, this might have a negative impact on performance, check invocations of EncodeWithAllocator method, falling back on runtime.SimpleAllocator")
|
||||
memAlloc = &runtime.SimpleAllocator{}
|
||||
@ -436,40 +492,43 @@ func (s *RawSerializer) doEncode(obj runtime.Object, w io.Writer, memAlloc runti
|
||||
case bufferedReverseMarshaller:
|
||||
// this path performs a single allocation during write only when the Allocator wasn't provided
|
||||
// it also requires the caller to implement the more efficient Size and MarshalToSizedBuffer methods
|
||||
encodedSize := uint64(t.Size())
|
||||
data := memAlloc.Allocate(encodedSize)
|
||||
if precomputedObjSize == nil {
|
||||
s := t.Size()
|
||||
precomputedObjSize = &s
|
||||
}
|
||||
data := memAlloc.Allocate(uint64(*precomputedObjSize))
|
||||
|
||||
n, err := t.MarshalToSizedBuffer(data)
|
||||
if err != nil {
|
||||
return err
|
||||
return 0, err
|
||||
}
|
||||
_, err = w.Write(data[:n])
|
||||
return err
|
||||
return w.Write(data[:n])
|
||||
|
||||
case bufferedMarshaller:
|
||||
// this path performs a single allocation during write only when the Allocator wasn't provided
|
||||
// it also requires the caller to implement the more efficient Size and MarshalTo methods
|
||||
encodedSize := uint64(t.Size())
|
||||
data := memAlloc.Allocate(encodedSize)
|
||||
if precomputedObjSize == nil {
|
||||
s := t.Size()
|
||||
precomputedObjSize = &s
|
||||
}
|
||||
data := memAlloc.Allocate(uint64(*precomputedObjSize))
|
||||
|
||||
n, err := t.MarshalTo(data)
|
||||
if err != nil {
|
||||
return err
|
||||
return 0, err
|
||||
}
|
||||
_, err = w.Write(data[:n])
|
||||
return err
|
||||
return w.Write(data[:n])
|
||||
|
||||
case proto.Marshaler:
|
||||
// this path performs extra allocations
|
||||
data, err := t.Marshal()
|
||||
if err != nil {
|
||||
return err
|
||||
return 0, err
|
||||
}
|
||||
_, err = w.Write(data)
|
||||
return err
|
||||
return w.Write(data)
|
||||
|
||||
default:
|
||||
return errNotMarshalable{reflect.TypeOf(obj)}
|
||||
return 0, errNotMarshalable{reflect.TypeOf(obj)}
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user