github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dra api: NodeResourceModel -> ResourceModel

Browse Source 
When renaming NodeResourceSlice to ResourceSlice, the embedded
[Node]ResourceModel also should have been renamed.
This commit is contained in:
Patrick Ohly
2024-03-14 14:08:17 +01:00
parent 3ec6a38795
commit a0add8d2c7
26 changed files with 552 additions and 552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/openapi-spec/swagger.json generated
View File

@@ -15088,7 +15088,7 @@
"type": "object" "type": "object"
}, },
"io.k8s.api.resource.v1alpha2.NamedResourcesResources": { "io.k8s.api.resource.v1alpha2.NamedResourcesResources": {
"description": "NamedResourcesResources is used in NodeResourceModel.", "description": "NamedResourcesResources is used in ResourceModel.",
"properties": { "properties": {
"instances": { "instances": {
"description": "The list of all individual resources instances currently available.", "description": "The list of all individual resources instances currently available.",

2
api/openapi-spec/v3/apis__resource.k8s.io__v1alpha2_openapi.json
View File

@@ -314,7 +314,7 @@
"type": "object" "type": "object"
}, },
"io.k8s.api.resource.v1alpha2.NamedResourcesResources": { "io.k8s.api.resource.v1alpha2.NamedResourcesResources": {
"description": "NamedResourcesResources is used in NodeResourceModel.", "description": "NamedResourcesResources is used in ResourceModel.",
"properties": { "properties": {
"instances": { "instances": {
"description": "The list of all individual resources instances currently available.", "description": "The list of all individual resources instances currently available.",

2
pkg/apis/resource/namedresources.go
View File

@@ -18,7 +18,7 @@ package resource
import "k8s.io/apimachinery/pkg/api/resource" import "k8s.io/apimachinery/pkg/api/resource"
// NamedResourcesResources is used in NodeResourceModel. // NamedResourcesResources is used in ResourceModel.
type NamedResourcesResources struct { type NamedResourcesResources struct {
// The list of all individual resources instances currently available. // The list of all individual resources instances currently available.
Instances []NamedResourcesInstance Instances []NamedResourcesInstance

6
pkg/apis/resource/types.go
View File

@@ -499,11 +499,11 @@ type ResourceSlice struct {
// objects with a certain driver name. // objects with a certain driver name.
DriverName string DriverName string
NodeResourceModel ResourceModel
} }
// NodeResourceModel must have one and only one field set. // ResourceModel must have one and only one field set.
type NodeResourceModel struct { type ResourceModel struct {
// NamedResources describes available resources using the named resources model. // NamedResources describes available resources using the named resources model.
NamedResources *NamedResourcesResources NamedResources *NamedResourcesResources
} }

64
pkg/apis/resource/v1alpha2/zz_generated.conversion.go generated
View File

@@ -171,16 +171,6 @@ func RegisterConversions(s *runtime.Scheme) error {
}); err != nil { }); err != nil {
return err return err
} }
if err := s.AddGeneratedConversionFunc((*v1alpha2.NodeResourceModel)(nil), (*resource.NodeResourceModel)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_NodeResourceModel_To_resource_NodeResourceModel(a.(*v1alpha2.NodeResourceModel), b.(*resource.NodeResourceModel), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*resource.NodeResourceModel)(nil), (*v1alpha2.NodeResourceModel)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_resource_NodeResourceModel_To_v1alpha2_NodeResourceModel(a.(*resource.NodeResourceModel), b.(*v1alpha2.NodeResourceModel), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*v1alpha2.PodSchedulingContext)(nil), (*resource.PodSchedulingContext)(nil), func(a, b interface{}, scope conversion.Scope) error { if err := s.AddGeneratedConversionFunc((*v1alpha2.PodSchedulingContext)(nil), (*resource.PodSchedulingContext)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_PodSchedulingContext_To_resource_PodSchedulingContext(a.(*v1alpha2.PodSchedulingContext), b.(*resource.PodSchedulingContext), scope) return Convert_v1alpha2_PodSchedulingContext_To_resource_PodSchedulingContext(a.(*v1alpha2.PodSchedulingContext), b.(*resource.PodSchedulingContext), scope)
}); err != nil { }); err != nil {
@@ -421,6 +411,16 @@ func RegisterConversions(s *runtime.Scheme) error {
}); err != nil { }); err != nil {
return err return err
} }
if err := s.AddGeneratedConversionFunc((*v1alpha2.ResourceModel)(nil), (*resource.ResourceModel)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_ResourceModel_To_resource_ResourceModel(a.(*v1alpha2.ResourceModel), b.(*resource.ResourceModel), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*resource.ResourceModel)(nil), (*v1alpha2.ResourceModel)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_resource_ResourceModel_To_v1alpha2_ResourceModel(a.(*resource.ResourceModel), b.(*v1alpha2.ResourceModel), scope)
}); err != nil {
return err
}
if err := s.AddGeneratedConversionFunc((*v1alpha2.ResourceRequest)(nil), (*resource.ResourceRequest)(nil), func(a, b interface{}, scope conversion.Scope) error { if err := s.AddGeneratedConversionFunc((*v1alpha2.ResourceRequest)(nil), (*resource.ResourceRequest)(nil), func(a, b interface{}, scope conversion.Scope) error {
return Convert_v1alpha2_ResourceRequest_To_resource_ResourceRequest(a.(*v1alpha2.ResourceRequest), b.(*resource.ResourceRequest), scope) return Convert_v1alpha2_ResourceRequest_To_resource_ResourceRequest(a.(*v1alpha2.ResourceRequest), b.(*resource.ResourceRequest), scope)
}); err != nil { }); err != nil {
@@ -826,26 +826,6 @@ func Convert_resource_NamedResourcesStringSlice_To_v1alpha2_NamedResourcesString
return autoConvert_resource_NamedResourcesStringSlice_To_v1alpha2_NamedResourcesStringSlice(in, out, s) return autoConvert_resource_NamedResourcesStringSlice_To_v1alpha2_NamedResourcesStringSlice(in, out, s)
} }
func autoConvert_v1alpha2_NodeResourceModel_To_resource_NodeResourceModel(in *v1alpha2.NodeResourceModel, out *resource.NodeResourceModel, s conversion.Scope) error {
out.NamedResources = (*resource.NamedResourcesResources)(unsafe.Pointer(in.NamedResources))
return nil
}
// Convert_v1alpha2_NodeResourceModel_To_resource_NodeResourceModel is an autogenerated conversion function.
func Convert_v1alpha2_NodeResourceModel_To_resource_NodeResourceModel(in *v1alpha2.NodeResourceModel, out *resource.NodeResourceModel, s conversion.Scope) error {
return autoConvert_v1alpha2_NodeResourceModel_To_resource_NodeResourceModel(in, out, s)
}
func autoConvert_resource_NodeResourceModel_To_v1alpha2_NodeResourceModel(in *resource.NodeResourceModel, out *v1alpha2.NodeResourceModel, s conversion.Scope) error {
out.NamedResources = (*v1alpha2.NamedResourcesResources)(unsafe.Pointer(in.NamedResources))
return nil
}
// Convert_resource_NodeResourceModel_To_v1alpha2_NodeResourceModel is an autogenerated conversion function.
func Convert_resource_NodeResourceModel_To_v1alpha2_NodeResourceModel(in *resource.NodeResourceModel, out *v1alpha2.NodeResourceModel, s conversion.Scope) error {
return autoConvert_resource_NodeResourceModel_To_v1alpha2_NodeResourceModel(in, out, s)
}
func autoConvert_v1alpha2_PodSchedulingContext_To_resource_PodSchedulingContext(in *v1alpha2.PodSchedulingContext, out *resource.PodSchedulingContext, s conversion.Scope) error { func autoConvert_v1alpha2_PodSchedulingContext_To_resource_PodSchedulingContext(in *v1alpha2.PodSchedulingContext, out *resource.PodSchedulingContext, s conversion.Scope) error {
out.ObjectMeta = in.ObjectMeta out.ObjectMeta = in.ObjectMeta
if err := Convert_v1alpha2_PodSchedulingContextSpec_To_resource_PodSchedulingContextSpec(&in.Spec, &out.Spec, s); err != nil { if err := Convert_v1alpha2_PodSchedulingContextSpec_To_resource_PodSchedulingContextSpec(&in.Spec, &out.Spec, s); err != nil {
@@ -1566,6 +1546,26 @@ func Convert_resource_ResourceHandle_To_v1alpha2_ResourceHandle(in *resource.Res
return autoConvert_resource_ResourceHandle_To_v1alpha2_ResourceHandle(in, out, s) return autoConvert_resource_ResourceHandle_To_v1alpha2_ResourceHandle(in, out, s)
} }
func autoConvert_v1alpha2_ResourceModel_To_resource_ResourceModel(in *v1alpha2.ResourceModel, out *resource.ResourceModel, s conversion.Scope) error {
out.NamedResources = (*resource.NamedResourcesResources)(unsafe.Pointer(in.NamedResources))
return nil
}
// Convert_v1alpha2_ResourceModel_To_resource_ResourceModel is an autogenerated conversion function.
func Convert_v1alpha2_ResourceModel_To_resource_ResourceModel(in *v1alpha2.ResourceModel, out *resource.ResourceModel, s conversion.Scope) error {
return autoConvert_v1alpha2_ResourceModel_To_resource_ResourceModel(in, out, s)
}
func autoConvert_resource_ResourceModel_To_v1alpha2_ResourceModel(in *resource.ResourceModel, out *v1alpha2.ResourceModel, s conversion.Scope) error {
out.NamedResources = (*v1alpha2.NamedResourcesResources)(unsafe.Pointer(in.NamedResources))
return nil
}
// Convert_resource_ResourceModel_To_v1alpha2_ResourceModel is an autogenerated conversion function.
func Convert_resource_ResourceModel_To_v1alpha2_ResourceModel(in *resource.ResourceModel, out *v1alpha2.ResourceModel, s conversion.Scope) error {
return autoConvert_resource_ResourceModel_To_v1alpha2_ResourceModel(in, out, s)
}
func autoConvert_v1alpha2_ResourceRequest_To_resource_ResourceRequest(in *v1alpha2.ResourceRequest, out *resource.ResourceRequest, s conversion.Scope) error { func autoConvert_v1alpha2_ResourceRequest_To_resource_ResourceRequest(in *v1alpha2.ResourceRequest, out *resource.ResourceRequest, s conversion.Scope) error {
if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.VendorParameters, &out.VendorParameters, s); err != nil { if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.VendorParameters, &out.VendorParameters, s); err != nil {
return err return err
@@ -1620,7 +1620,7 @@ func autoConvert_v1alpha2_ResourceSlice_To_resource_ResourceSlice(in *v1alpha2.R
out.ObjectMeta = in.ObjectMeta out.ObjectMeta = in.ObjectMeta
out.NodeName = in.NodeName out.NodeName = in.NodeName
out.DriverName = in.DriverName out.DriverName = in.DriverName
if err := Convert_v1alpha2_NodeResourceModel_To_resource_NodeResourceModel(&in.NodeResourceModel, &out.NodeResourceModel, s); err != nil { if err := Convert_v1alpha2_ResourceModel_To_resource_ResourceModel(&in.ResourceModel, &out.ResourceModel, s); err != nil {
return err return err
} }
return nil return nil
@@ -1635,7 +1635,7 @@ func autoConvert_resource_ResourceSlice_To_v1alpha2_ResourceSlice(in *resource.R
out.ObjectMeta = in.ObjectMeta out.ObjectMeta = in.ObjectMeta
out.NodeName = in.NodeName out.NodeName = in.NodeName
out.DriverName = in.DriverName out.DriverName = in.DriverName
if err := Convert_resource_NodeResourceModel_To_v1alpha2_NodeResourceModel(&in.NodeResourceModel, &out.NodeResourceModel, s); err != nil { if err := Convert_resource_ResourceModel_To_v1alpha2_ResourceModel(&in.ResourceModel, &out.ResourceModel, s); err != nil {
return err return err
} }
return nil return nil

4
pkg/apis/resource/validation/validation.go
View File

@@ -397,11 +397,11 @@ func ValidateResourceSlice(resourceSlice *resource.ResourceSlice) field.ErrorLis
allErrs = append(allErrs, validateNodeName(resourceSlice.NodeName, field.NewPath("nodeName"))...) allErrs = append(allErrs, validateNodeName(resourceSlice.NodeName, field.NewPath("nodeName"))...)
} }
allErrs = append(allErrs, validateResourceDriverName(resourceSlice.DriverName, field.NewPath("driverName"))...) allErrs = append(allErrs, validateResourceDriverName(resourceSlice.DriverName, field.NewPath("driverName"))...)
allErrs = append(allErrs, validateNodeResourceModel(&resourceSlice.NodeResourceModel, nil)...) allErrs = append(allErrs, validateResourceModel(&resourceSlice.ResourceModel, nil)...)
return allErrs return allErrs
} }
func validateNodeResourceModel(model *resource.NodeResourceModel, fldPath *field.Path) field.ErrorList { func validateResourceModel(model *resource.ResourceModel, fldPath *field.Path) field.ErrorList {
var allErrs field.ErrorList var allErrs field.ErrorList
entries := sets.New[string]() entries := sets.New[string]()
if model.NamedResources != nil { if model.NamedResources != nil {

4
pkg/apis/resource/validation/validation_resourceslice_test.go
View File

@@ -34,7 +34,7 @@ func testResourceSlice(name, nodeName, driverName string) *resource.ResourceSlic
}, },
NodeName: nodeName, NodeName: nodeName,
DriverName: driverName, DriverName: driverName,
NodeResourceModel: resource.NodeResourceModel{ ResourceModel: resource.ResourceModel{
NamedResources: &resource.NamedResourcesResources{}, NamedResources: &resource.NamedResourcesResources{},
}, },
} }
@@ -192,7 +192,7 @@ func TestValidateResourceSlice(t *testing.T) {
wantFailures: field.ErrorList{field.Required(nil, "exactly one structured model field must be set")}, wantFailures: field.ErrorList{field.Required(nil, "exactly one structured model field must be set")},
slice: func() *resource.ResourceSlice { slice: func() *resource.ResourceSlice {
slice := testResourceSlice(goodName, goodName, driverName) slice := testResourceSlice(goodName, goodName, driverName)
slice.NodeResourceModel = resource.NodeResourceModel{} slice.ResourceModel = resource.ResourceModel{}
return slice return slice
}(), }(),
}, },

44
pkg/apis/resource/zz_generated.deepcopy.go generated
View File

@@ -325,27 +325,6 @@ func (in *NamedResourcesStringSlice) DeepCopy() *NamedResourcesStringSlice {
return out return out
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *NodeResourceModel) DeepCopyInto(out *NodeResourceModel) {
*out = *in
if in.NamedResources != nil {
in, out := &in.NamedResources, &out.NamedResources
*out = new(NamedResourcesResources)
(*in).DeepCopyInto(*out)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NodeResourceModel.
func (in *NodeResourceModel) DeepCopy() *NodeResourceModel {
if in == nil {
return nil
}
out := new(NodeResourceModel)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *PodSchedulingContext) DeepCopyInto(out *PodSchedulingContext) { func (in *PodSchedulingContext) DeepCopyInto(out *PodSchedulingContext) {
*out = *in *out = *in
@@ -988,6 +967,27 @@ func (in *ResourceHandle) DeepCopy() *ResourceHandle {
return out return out
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ResourceModel) DeepCopyInto(out *ResourceModel) {
*out = *in
if in.NamedResources != nil {
in, out := &in.NamedResources, &out.NamedResources
*out = new(NamedResourcesResources)
(*in).DeepCopyInto(*out)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceModel.
func (in *ResourceModel) DeepCopy() *ResourceModel {
if in == nil {
return nil
}
out := new(ResourceModel)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ResourceRequest) DeepCopyInto(out *ResourceRequest) { func (in *ResourceRequest) DeepCopyInto(out *ResourceRequest) {
*out = *in *out = *in
@@ -1034,7 +1034,7 @@ func (in *ResourceSlice) DeepCopyInto(out *ResourceSlice) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
in.NodeResourceModel.DeepCopyInto(&out.NodeResourceModel) in.ResourceModel.DeepCopyInto(&out.ResourceModel)
return return
} }

46
pkg/generated/openapi/zz_generated.openapi.go generated
View File

@@ -885,7 +885,6 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
"k8s.io/api/resource/v1alpha2.NamedResourcesRequest": schema_k8sio_api_resource_v1alpha2_NamedResourcesRequest(ref), "k8s.io/api/resource/v1alpha2.NamedResourcesRequest": schema_k8sio_api_resource_v1alpha2_NamedResourcesRequest(ref),
"k8s.io/api/resource/v1alpha2.NamedResourcesResources": schema_k8sio_api_resource_v1alpha2_NamedResourcesResources(ref), "k8s.io/api/resource/v1alpha2.NamedResourcesResources": schema_k8sio_api_resource_v1alpha2_NamedResourcesResources(ref),
"k8s.io/api/resource/v1alpha2.NamedResourcesStringSlice": schema_k8sio_api_resource_v1alpha2_NamedResourcesStringSlice(ref), "k8s.io/api/resource/v1alpha2.NamedResourcesStringSlice": schema_k8sio_api_resource_v1alpha2_NamedResourcesStringSlice(ref),
"k8s.io/api/resource/v1alpha2.NodeResourceModel": schema_k8sio_api_resource_v1alpha2_NodeResourceModel(ref),
"k8s.io/api/resource/v1alpha2.PodSchedulingContext": schema_k8sio_api_resource_v1alpha2_PodSchedulingContext(ref), "k8s.io/api/resource/v1alpha2.PodSchedulingContext": schema_k8sio_api_resource_v1alpha2_PodSchedulingContext(ref),
"k8s.io/api/resource/v1alpha2.PodSchedulingContextList": schema_k8sio_api_resource_v1alpha2_PodSchedulingContextList(ref), "k8s.io/api/resource/v1alpha2.PodSchedulingContextList": schema_k8sio_api_resource_v1alpha2_PodSchedulingContextList(ref),
"k8s.io/api/resource/v1alpha2.PodSchedulingContextSpec": schema_k8sio_api_resource_v1alpha2_PodSchedulingContextSpec(ref), "k8s.io/api/resource/v1alpha2.PodSchedulingContextSpec": schema_k8sio_api_resource_v1alpha2_PodSchedulingContextSpec(ref),
@@ -910,6 +909,7 @@ func GetOpenAPIDefinitions(ref common.ReferenceCallback) map[string]common.OpenA
"k8s.io/api/resource/v1alpha2.ResourceFilter": schema_k8sio_api_resource_v1alpha2_ResourceFilter(ref), "k8s.io/api/resource/v1alpha2.ResourceFilter": schema_k8sio_api_resource_v1alpha2_ResourceFilter(ref),
"k8s.io/api/resource/v1alpha2.ResourceFilterModel": schema_k8sio_api_resource_v1alpha2_ResourceFilterModel(ref), "k8s.io/api/resource/v1alpha2.ResourceFilterModel": schema_k8sio_api_resource_v1alpha2_ResourceFilterModel(ref),
"k8s.io/api/resource/v1alpha2.ResourceHandle": schema_k8sio_api_resource_v1alpha2_ResourceHandle(ref), "k8s.io/api/resource/v1alpha2.ResourceHandle": schema_k8sio_api_resource_v1alpha2_ResourceHandle(ref),
"k8s.io/api/resource/v1alpha2.ResourceModel": schema_k8sio_api_resource_v1alpha2_ResourceModel(ref),
"k8s.io/api/resource/v1alpha2.ResourceRequest": schema_k8sio_api_resource_v1alpha2_ResourceRequest(ref), "k8s.io/api/resource/v1alpha2.ResourceRequest": schema_k8sio_api_resource_v1alpha2_ResourceRequest(ref),
"k8s.io/api/resource/v1alpha2.ResourceRequestModel": schema_k8sio_api_resource_v1alpha2_ResourceRequestModel(ref), "k8s.io/api/resource/v1alpha2.ResourceRequestModel": schema_k8sio_api_resource_v1alpha2_ResourceRequestModel(ref),
"k8s.io/api/resource/v1alpha2.ResourceSlice": schema_k8sio_api_resource_v1alpha2_ResourceSlice(ref), "k8s.io/api/resource/v1alpha2.ResourceSlice": schema_k8sio_api_resource_v1alpha2_ResourceSlice(ref),
@@ -45331,7 +45331,7 @@ func schema_k8sio_api_resource_v1alpha2_NamedResourcesResources(ref common.Refer
return common.OpenAPIDefinition{ return common.OpenAPIDefinition{
Schema: spec.Schema{ Schema: spec.Schema{
SchemaProps: spec.SchemaProps{ SchemaProps: spec.SchemaProps{
Description: "NamedResourcesResources is used in NodeResourceModel.", Description: "NamedResourcesResources is used in ResourceModel.",
Type: []string{"object"}, Type: []string{"object"},
Properties: map[string]spec.Schema{ Properties: map[string]spec.Schema{
"instances": { "instances": {
@@ -45396,27 +45396,6 @@ func schema_k8sio_api_resource_v1alpha2_NamedResourcesStringSlice(ref common.Ref
} }
} }
func schema_k8sio_api_resource_v1alpha2_NodeResourceModel(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "NodeResourceModel must have one and only one field set.",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"namedResources": {
SchemaProps: spec.SchemaProps{
Description: "NamedResources describes available resources using the named resources model.",
Ref: ref("k8s.io/api/resource/v1alpha2.NamedResourcesResources"),
},
},
},
},
},
Dependencies: []string{
"k8s.io/api/resource/v1alpha2.NamedResourcesResources"},
}
}
func schema_k8sio_api_resource_v1alpha2_PodSchedulingContext(ref common.ReferenceCallback) common.OpenAPIDefinition { func schema_k8sio_api_resource_v1alpha2_PodSchedulingContext(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{ return common.OpenAPIDefinition{
Schema: spec.Schema{ Schema: spec.Schema{
@@ -46534,6 +46513,27 @@ func schema_k8sio_api_resource_v1alpha2_ResourceHandle(ref common.ReferenceCallb
} }
} }
func schema_k8sio_api_resource_v1alpha2_ResourceModel(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{
Schema: spec.Schema{
SchemaProps: spec.SchemaProps{
Description: "ResourceModel must have one and only one field set.",
Type: []string{"object"},
Properties: map[string]spec.Schema{
"namedResources": {
SchemaProps: spec.SchemaProps{
Description: "NamedResources describes available resources using the named resources model.",
Ref: ref("k8s.io/api/resource/v1alpha2.NamedResourcesResources"),
},
},
},
},
},
Dependencies: []string{
"k8s.io/api/resource/v1alpha2.NamedResourcesResources"},
}
}
func schema_k8sio_api_resource_v1alpha2_ResourceRequest(ref common.ReferenceCallback) common.OpenAPIDefinition { func schema_k8sio_api_resource_v1alpha2_ResourceRequest(ref common.ReferenceCallback) common.OpenAPIDefinition {
return common.OpenAPIDefinition{ return common.OpenAPIDefinition{
Schema: spec.Schema{ Schema: spec.Schema{

14
pkg/kubelet/cm/dra/plugin/noderesources.go
View File

@@ -74,7 +74,7 @@ type activePlugin struct {
// When receiving updates from the driver, the entire slice gets replaced, // When receiving updates from the driver, the entire slice gets replaced,
// so it is okay to not do a deep copy of it. Only retrieving the slice // so it is okay to not do a deep copy of it. Only retrieving the slice
// must be protected by a read lock. // must be protected by a read lock.
resources []*resourceapi.NodeResourceModel resources []*resourceapi.ResourceModel
} }
// startNodeResourcesController constructs a new controller and starts it. // startNodeResourcesController constructs a new controller and starts it.
@@ -364,7 +364,7 @@ func (c *nodeResourcesController) sync(ctx context.Context, driverName string) e
// Gather information about the actual and desired state. // Gather information about the actual and desired state.
slices := c.sliceStore.List() slices := c.sliceStore.List()
var driverResources []*resourceapi.NodeResourceModel var driverResources []*resourceapi.ResourceModel
c.mutex.RLock() c.mutex.RLock()
if active, ok := c.activePlugins[driverName]; ok { if active, ok := c.activePlugins[driverName]; ok {
// No need for a deep copy, the entire slice gets replaced on writes. // No need for a deep copy, the entire slice gets replaced on writes.
@@ -387,7 +387,7 @@ func (c *nodeResourcesController) sync(ctx context.Context, driverName string) e
continue continue
} }
index := indexOfModel(driverResources, &slice.NodeResourceModel) index := indexOfModel(driverResources, &slice.ResourceModel)
if index >= 0 { if index >= 0 {
storedResourceIndices.Insert(index) storedResourceIndices.Insert(index)
continue continue
@@ -408,7 +408,7 @@ func (c *nodeResourcesController) sync(ctx context.Context, driverName string) e
// We don't really know which of these slices might have // We don't really know which of these slices might have
// been used for "the" driver resource because they don't // been used for "the" driver resource because they don't
// have a unique ID. In practice, a driver is most likely // have a unique ID. In practice, a driver is most likely
// to just give us one NodeResourceModel, in which case // to just give us one ResourceModel, in which case
// this isn't a problem at all. If we have more than one, // this isn't a problem at all. If we have more than one,
// then at least conceptually it currently doesn't matter // then at least conceptually it currently doesn't matter
// where we publish it. // where we publish it.
@@ -433,7 +433,7 @@ func (c *nodeResourcesController) sync(ctx context.Context, driverName string) e
slice := obsoleteSlices[numObsoleteSlices-1] slice := obsoleteSlices[numObsoleteSlices-1]
numObsoleteSlices-- numObsoleteSlices--
slice = slice.DeepCopy() slice = slice.DeepCopy()
slice.NodeResourceModel = *resource slice.ResourceModel = *resource
logger.V(5).Info("Reusing existing node resource slice", "slice", klog.KObj(slice)) logger.V(5).Info("Reusing existing node resource slice", "slice", klog.KObj(slice))
if _, err := c.kubeClient.ResourceV1alpha2().ResourceSlices().Update(ctx, slice, metav1.UpdateOptions{}); err != nil { if _, err := c.kubeClient.ResourceV1alpha2().ResourceSlices().Update(ctx, slice, metav1.UpdateOptions{}); err != nil {
return fmt.Errorf("update node resource slice: %w", err) return fmt.Errorf("update node resource slice: %w", err)
@@ -449,7 +449,7 @@ func (c *nodeResourcesController) sync(ctx context.Context, driverName string) e
}, },
NodeName: c.nodeName, NodeName: c.nodeName,
DriverName: driverName, DriverName: driverName,
NodeResourceModel: *resource, ResourceModel: *resource,
} }
logger.V(5).Info("Creating new node resource slice", "slice", klog.KObj(slice)) logger.V(5).Info("Creating new node resource slice", "slice", klog.KObj(slice))
if _, err := c.kubeClient.ResourceV1alpha2().ResourceSlices().Create(ctx, slice, metav1.CreateOptions{}); err != nil { if _, err := c.kubeClient.ResourceV1alpha2().ResourceSlices().Create(ctx, slice, metav1.CreateOptions{}); err != nil {
@@ -469,7 +469,7 @@ func (c *nodeResourcesController) sync(ctx context.Context, driverName string) e
return nil return nil
} }
func indexOfModel(models []*resourceapi.NodeResourceModel, model *resourceapi.NodeResourceModel) int { func indexOfModel(models []*resourceapi.ResourceModel, model *resourceapi.ResourceModel) int {
for index, m := range models { for index, m := range models {
if apiequality.Semantic.DeepEqual(m, model) { if apiequality.Semantic.DeepEqual(m, model) {
return index return index

2
pkg/registry/resource/resourceslice/storage/storage_test.go
View File

@@ -53,7 +53,7 @@ func validNewResourceSlice(name string) *resource.ResourceSlice {
}, },
NodeName: name, NodeName: name,
DriverName: "cdi.example.com", DriverName: "cdi.example.com",
NodeResourceModel: resource.NodeResourceModel{ ResourceModel: resource.ResourceModel{
NamedResources: &resource.NamedResourcesResources{}, NamedResources: &resource.NamedResourcesResources{},
}, },
} }

2
pkg/registry/resource/resourceslice/strategy_test.go
View File

@@ -30,7 +30,7 @@ var slice = &resource.ResourceSlice{
}, },
NodeName: "valid-node-name", NodeName: "valid-node-name",
DriverName: "testdriver.example.com", DriverName: "testdriver.example.com",
NodeResourceModel: resource.NodeResourceModel{ ResourceModel: resource.ResourceModel{
NamedResources: &resource.NamedResourcesResources{}, NamedResources: &resource.NamedResourcesResources{},
}, },
} }

688
staging/src/k8s.io/api/resource/v1alpha2/generated.pb.go generated
View File

@@ -411,38 +411,10 @@ func (m *NamedResourcesStringSlice) XXX_DiscardUnknown() {
var xxx_messageInfo_NamedResourcesStringSlice proto.InternalMessageInfo var xxx_messageInfo_NamedResourcesStringSlice proto.InternalMessageInfo
func (m *NodeResourceModel) Reset() { *m = NodeResourceModel{} }
func (*NodeResourceModel) ProtoMessage() {}
func (*NodeResourceModel) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{13}
}
func (m *NodeResourceModel) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *NodeResourceModel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
return b[:n], nil
}
func (m *NodeResourceModel) XXX_Merge(src proto.Message) {
xxx_messageInfo_NodeResourceModel.Merge(m, src)
}
func (m *NodeResourceModel) XXX_Size() int {
return m.Size()
}
func (m *NodeResourceModel) XXX_DiscardUnknown() {
xxx_messageInfo_NodeResourceModel.DiscardUnknown(m)
}
var xxx_messageInfo_NodeResourceModel proto.InternalMessageInfo
func (m *PodSchedulingContext) Reset() { *m = PodSchedulingContext{} } func (m *PodSchedulingContext) Reset() { *m = PodSchedulingContext{} }
func (*PodSchedulingContext) ProtoMessage() {} func (*PodSchedulingContext) ProtoMessage() {}
func (*PodSchedulingContext) Descriptor() ([]byte, []int) { func (*PodSchedulingContext) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{14} return fileDescriptor_4312f5b44a31ec02, []int{13}
} }
func (m *PodSchedulingContext) XXX_Unmarshal(b []byte) error { func (m *PodSchedulingContext) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -470,7 +442,7 @@ var xxx_messageInfo_PodSchedulingContext proto.InternalMessageInfo
func (m *PodSchedulingContextList) Reset() { *m = PodSchedulingContextList{} } func (m *PodSchedulingContextList) Reset() { *m = PodSchedulingContextList{} }
func (*PodSchedulingContextList) ProtoMessage() {} func (*PodSchedulingContextList) ProtoMessage() {}
func (*PodSchedulingContextList) Descriptor() ([]byte, []int) { func (*PodSchedulingContextList) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{15} return fileDescriptor_4312f5b44a31ec02, []int{14}
} }
func (m *PodSchedulingContextList) XXX_Unmarshal(b []byte) error { func (m *PodSchedulingContextList) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -498,7 +470,7 @@ var xxx_messageInfo_PodSchedulingContextList proto.InternalMessageInfo
func (m *PodSchedulingContextSpec) Reset() { *m = PodSchedulingContextSpec{} } func (m *PodSchedulingContextSpec) Reset() { *m = PodSchedulingContextSpec{} }
func (*PodSchedulingContextSpec) ProtoMessage() {} func (*PodSchedulingContextSpec) ProtoMessage() {}
func (*PodSchedulingContextSpec) Descriptor() ([]byte, []int) { func (*PodSchedulingContextSpec) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{16} return fileDescriptor_4312f5b44a31ec02, []int{15}
} }
func (m *PodSchedulingContextSpec) XXX_Unmarshal(b []byte) error { func (m *PodSchedulingContextSpec) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -526,7 +498,7 @@ var xxx_messageInfo_PodSchedulingContextSpec proto.InternalMessageInfo
func (m *PodSchedulingContextStatus) Reset() { *m = PodSchedulingContextStatus{} } func (m *PodSchedulingContextStatus) Reset() { *m = PodSchedulingContextStatus{} }
func (*PodSchedulingContextStatus) ProtoMessage() {} func (*PodSchedulingContextStatus) ProtoMessage() {}
func (*PodSchedulingContextStatus) Descriptor() ([]byte, []int) { func (*PodSchedulingContextStatus) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{17} return fileDescriptor_4312f5b44a31ec02, []int{16}
} }
func (m *PodSchedulingContextStatus) XXX_Unmarshal(b []byte) error { func (m *PodSchedulingContextStatus) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -554,7 +526,7 @@ var xxx_messageInfo_PodSchedulingContextStatus proto.InternalMessageInfo
func (m *ResourceClaim) Reset() { *m = ResourceClaim{} } func (m *ResourceClaim) Reset() { *m = ResourceClaim{} }
func (*ResourceClaim) ProtoMessage() {} func (*ResourceClaim) ProtoMessage() {}
func (*ResourceClaim) Descriptor() ([]byte, []int) { func (*ResourceClaim) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{18} return fileDescriptor_4312f5b44a31ec02, []int{17}
} }
func (m *ResourceClaim) XXX_Unmarshal(b []byte) error { func (m *ResourceClaim) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -582,7 +554,7 @@ var xxx_messageInfo_ResourceClaim proto.InternalMessageInfo
func (m *ResourceClaimConsumerReference) Reset() { *m = ResourceClaimConsumerReference{} } func (m *ResourceClaimConsumerReference) Reset() { *m = ResourceClaimConsumerReference{} }
func (*ResourceClaimConsumerReference) ProtoMessage() {} func (*ResourceClaimConsumerReference) ProtoMessage() {}
func (*ResourceClaimConsumerReference) Descriptor() ([]byte, []int) { func (*ResourceClaimConsumerReference) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{19} return fileDescriptor_4312f5b44a31ec02, []int{18}
} }
func (m *ResourceClaimConsumerReference) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimConsumerReference) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -610,7 +582,7 @@ var xxx_messageInfo_ResourceClaimConsumerReference proto.InternalMessageInfo
func (m *ResourceClaimList) Reset() { *m = ResourceClaimList{} } func (m *ResourceClaimList) Reset() { *m = ResourceClaimList{} }
func (*ResourceClaimList) ProtoMessage() {} func (*ResourceClaimList) ProtoMessage() {}
func (*ResourceClaimList) Descriptor() ([]byte, []int) { func (*ResourceClaimList) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{20} return fileDescriptor_4312f5b44a31ec02, []int{19}
} }
func (m *ResourceClaimList) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimList) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -638,7 +610,7 @@ var xxx_messageInfo_ResourceClaimList proto.InternalMessageInfo
func (m *ResourceClaimParameters) Reset() { *m = ResourceClaimParameters{} } func (m *ResourceClaimParameters) Reset() { *m = ResourceClaimParameters{} }
func (*ResourceClaimParameters) ProtoMessage() {} func (*ResourceClaimParameters) ProtoMessage() {}
func (*ResourceClaimParameters) Descriptor() ([]byte, []int) { func (*ResourceClaimParameters) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{21} return fileDescriptor_4312f5b44a31ec02, []int{20}
} }
func (m *ResourceClaimParameters) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimParameters) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -666,7 +638,7 @@ var xxx_messageInfo_ResourceClaimParameters proto.InternalMessageInfo
func (m *ResourceClaimParametersList) Reset() { *m = ResourceClaimParametersList{} } func (m *ResourceClaimParametersList) Reset() { *m = ResourceClaimParametersList{} }
func (*ResourceClaimParametersList) ProtoMessage() {} func (*ResourceClaimParametersList) ProtoMessage() {}
func (*ResourceClaimParametersList) Descriptor() ([]byte, []int) { func (*ResourceClaimParametersList) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{22} return fileDescriptor_4312f5b44a31ec02, []int{21}
} }
func (m *ResourceClaimParametersList) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimParametersList) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -694,7 +666,7 @@ var xxx_messageInfo_ResourceClaimParametersList proto.InternalMessageInfo
func (m *ResourceClaimParametersReference) Reset() { *m = ResourceClaimParametersReference{} } func (m *ResourceClaimParametersReference) Reset() { *m = ResourceClaimParametersReference{} }
func (*ResourceClaimParametersReference) ProtoMessage() {} func (*ResourceClaimParametersReference) ProtoMessage() {}
func (*ResourceClaimParametersReference) Descriptor() ([]byte, []int) { func (*ResourceClaimParametersReference) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{23} return fileDescriptor_4312f5b44a31ec02, []int{22}
} }
func (m *ResourceClaimParametersReference) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimParametersReference) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -722,7 +694,7 @@ var xxx_messageInfo_ResourceClaimParametersReference proto.InternalMessageInfo
func (m *ResourceClaimSchedulingStatus) Reset() { *m = ResourceClaimSchedulingStatus{} } func (m *ResourceClaimSchedulingStatus) Reset() { *m = ResourceClaimSchedulingStatus{} }
func (*ResourceClaimSchedulingStatus) ProtoMessage() {} func (*ResourceClaimSchedulingStatus) ProtoMessage() {}
func (*ResourceClaimSchedulingStatus) Descriptor() ([]byte, []int) { func (*ResourceClaimSchedulingStatus) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{24} return fileDescriptor_4312f5b44a31ec02, []int{23}
} }
func (m *ResourceClaimSchedulingStatus) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimSchedulingStatus) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -750,7 +722,7 @@ var xxx_messageInfo_ResourceClaimSchedulingStatus proto.InternalMessageInfo
func (m *ResourceClaimSpec) Reset() { *m = ResourceClaimSpec{} } func (m *ResourceClaimSpec) Reset() { *m = ResourceClaimSpec{} }
func (*ResourceClaimSpec) ProtoMessage() {} func (*ResourceClaimSpec) ProtoMessage() {}
func (*ResourceClaimSpec) Descriptor() ([]byte, []int) { func (*ResourceClaimSpec) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{25} return fileDescriptor_4312f5b44a31ec02, []int{24}
} }
func (m *ResourceClaimSpec) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimSpec) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -778,7 +750,7 @@ var xxx_messageInfo_ResourceClaimSpec proto.InternalMessageInfo
func (m *ResourceClaimStatus) Reset() { *m = ResourceClaimStatus{} } func (m *ResourceClaimStatus) Reset() { *m = ResourceClaimStatus{} }
func (*ResourceClaimStatus) ProtoMessage() {} func (*ResourceClaimStatus) ProtoMessage() {}
func (*ResourceClaimStatus) Descriptor() ([]byte, []int) { func (*ResourceClaimStatus) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{26} return fileDescriptor_4312f5b44a31ec02, []int{25}
} }
func (m *ResourceClaimStatus) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimStatus) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -806,7 +778,7 @@ var xxx_messageInfo_ResourceClaimStatus proto.InternalMessageInfo
func (m *ResourceClaimTemplate) Reset() { *m = ResourceClaimTemplate{} } func (m *ResourceClaimTemplate) Reset() { *m = ResourceClaimTemplate{} }
func (*ResourceClaimTemplate) ProtoMessage() {} func (*ResourceClaimTemplate) ProtoMessage() {}
func (*ResourceClaimTemplate) Descriptor() ([]byte, []int) { func (*ResourceClaimTemplate) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{27} return fileDescriptor_4312f5b44a31ec02, []int{26}
} }
func (m *ResourceClaimTemplate) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimTemplate) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -834,7 +806,7 @@ var xxx_messageInfo_ResourceClaimTemplate proto.InternalMessageInfo
func (m *ResourceClaimTemplateList) Reset() { *m = ResourceClaimTemplateList{} } func (m *ResourceClaimTemplateList) Reset() { *m = ResourceClaimTemplateList{} }
func (*ResourceClaimTemplateList) ProtoMessage() {} func (*ResourceClaimTemplateList) ProtoMessage() {}
func (*ResourceClaimTemplateList) Descriptor() ([]byte, []int) { func (*ResourceClaimTemplateList) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{28} return fileDescriptor_4312f5b44a31ec02, []int{27}
} }
func (m *ResourceClaimTemplateList) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimTemplateList) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -862,7 +834,7 @@ var xxx_messageInfo_ResourceClaimTemplateList proto.InternalMessageInfo
func (m *ResourceClaimTemplateSpec) Reset() { *m = ResourceClaimTemplateSpec{} } func (m *ResourceClaimTemplateSpec) Reset() { *m = ResourceClaimTemplateSpec{} }
func (*ResourceClaimTemplateSpec) ProtoMessage() {} func (*ResourceClaimTemplateSpec) ProtoMessage() {}
func (*ResourceClaimTemplateSpec) Descriptor() ([]byte, []int) { func (*ResourceClaimTemplateSpec) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{29} return fileDescriptor_4312f5b44a31ec02, []int{28}
} }
func (m *ResourceClaimTemplateSpec) XXX_Unmarshal(b []byte) error { func (m *ResourceClaimTemplateSpec) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -890,7 +862,7 @@ var xxx_messageInfo_ResourceClaimTemplateSpec proto.InternalMessageInfo
func (m *ResourceClass) Reset() { *m = ResourceClass{} } func (m *ResourceClass) Reset() { *m = ResourceClass{} }
func (*ResourceClass) ProtoMessage() {} func (*ResourceClass) ProtoMessage() {}
func (*ResourceClass) Descriptor() ([]byte, []int) { func (*ResourceClass) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{30} return fileDescriptor_4312f5b44a31ec02, []int{29}
} }
func (m *ResourceClass) XXX_Unmarshal(b []byte) error { func (m *ResourceClass) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -918,7 +890,7 @@ var xxx_messageInfo_ResourceClass proto.InternalMessageInfo
func (m *ResourceClassList) Reset() { *m = ResourceClassList{} } func (m *ResourceClassList) Reset() { *m = ResourceClassList{} }
func (*ResourceClassList) ProtoMessage() {} func (*ResourceClassList) ProtoMessage() {}
func (*ResourceClassList) Descriptor() ([]byte, []int) { func (*ResourceClassList) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{31} return fileDescriptor_4312f5b44a31ec02, []int{30}
} }
func (m *ResourceClassList) XXX_Unmarshal(b []byte) error { func (m *ResourceClassList) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -946,7 +918,7 @@ var xxx_messageInfo_ResourceClassList proto.InternalMessageInfo
func (m *ResourceClassParameters) Reset() { *m = ResourceClassParameters{} } func (m *ResourceClassParameters) Reset() { *m = ResourceClassParameters{} }
func (*ResourceClassParameters) ProtoMessage() {} func (*ResourceClassParameters) ProtoMessage() {}
func (*ResourceClassParameters) Descriptor() ([]byte, []int) { func (*ResourceClassParameters) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{32} return fileDescriptor_4312f5b44a31ec02, []int{31}
} }
func (m *ResourceClassParameters) XXX_Unmarshal(b []byte) error { func (m *ResourceClassParameters) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -974,7 +946,7 @@ var xxx_messageInfo_ResourceClassParameters proto.InternalMessageInfo
func (m *ResourceClassParametersList) Reset() { *m = ResourceClassParametersList{} } func (m *ResourceClassParametersList) Reset() { *m = ResourceClassParametersList{} }
func (*ResourceClassParametersList) ProtoMessage() {} func (*ResourceClassParametersList) ProtoMessage() {}
func (*ResourceClassParametersList) Descriptor() ([]byte, []int) { func (*ResourceClassParametersList) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{33} return fileDescriptor_4312f5b44a31ec02, []int{32}
} }
func (m *ResourceClassParametersList) XXX_Unmarshal(b []byte) error { func (m *ResourceClassParametersList) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -1002,7 +974,7 @@ var xxx_messageInfo_ResourceClassParametersList proto.InternalMessageInfo
func (m *ResourceClassParametersReference) Reset() { *m = ResourceClassParametersReference{} } func (m *ResourceClassParametersReference) Reset() { *m = ResourceClassParametersReference{} }
func (*ResourceClassParametersReference) ProtoMessage() {} func (*ResourceClassParametersReference) ProtoMessage() {}
func (*ResourceClassParametersReference) Descriptor() ([]byte, []int) { func (*ResourceClassParametersReference) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{34} return fileDescriptor_4312f5b44a31ec02, []int{33}
} }
func (m *ResourceClassParametersReference) XXX_Unmarshal(b []byte) error { func (m *ResourceClassParametersReference) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -1030,7 +1002,7 @@ var xxx_messageInfo_ResourceClassParametersReference proto.InternalMessageInfo
func (m *ResourceFilter) Reset() { *m = ResourceFilter{} } func (m *ResourceFilter) Reset() { *m = ResourceFilter{} }
func (*ResourceFilter) ProtoMessage() {} func (*ResourceFilter) ProtoMessage() {}
func (*ResourceFilter) Descriptor() ([]byte, []int) { func (*ResourceFilter) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{35} return fileDescriptor_4312f5b44a31ec02, []int{34}
} }
func (m *ResourceFilter) XXX_Unmarshal(b []byte) error { func (m *ResourceFilter) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -1058,7 +1030,7 @@ var xxx_messageInfo_ResourceFilter proto.InternalMessageInfo
func (m *ResourceFilterModel) Reset() { *m = ResourceFilterModel{} } func (m *ResourceFilterModel) Reset() { *m = ResourceFilterModel{} }
func (*ResourceFilterModel) ProtoMessage() {} func (*ResourceFilterModel) ProtoMessage() {}
func (*ResourceFilterModel) Descriptor() ([]byte, []int) { func (*ResourceFilterModel) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{36} return fileDescriptor_4312f5b44a31ec02, []int{35}
} }
func (m *ResourceFilterModel) XXX_Unmarshal(b []byte) error { func (m *ResourceFilterModel) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -1086,7 +1058,7 @@ var xxx_messageInfo_ResourceFilterModel proto.InternalMessageInfo
func (m *ResourceHandle) Reset() { *m = ResourceHandle{} } func (m *ResourceHandle) Reset() { *m = ResourceHandle{} }
func (*ResourceHandle) ProtoMessage() {} func (*ResourceHandle) ProtoMessage() {}
func (*ResourceHandle) Descriptor() ([]byte, []int) { func (*ResourceHandle) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{37} return fileDescriptor_4312f5b44a31ec02, []int{36}
} }
func (m *ResourceHandle) XXX_Unmarshal(b []byte) error { func (m *ResourceHandle) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b) return m.Unmarshal(b)
@@ -1111,6 +1083,34 @@ func (m *ResourceHandle) XXX_DiscardUnknown() {
var xxx_messageInfo_ResourceHandle proto.InternalMessageInfo var xxx_messageInfo_ResourceHandle proto.InternalMessageInfo
func (m *ResourceModel) Reset() { *m = ResourceModel{} }
func (*ResourceModel) ProtoMessage() {}
func (*ResourceModel) Descriptor() ([]byte, []int) {
return fileDescriptor_4312f5b44a31ec02, []int{37}
}
func (m *ResourceModel) XXX_Unmarshal(b []byte) error {
return m.Unmarshal(b)
}
func (m *ResourceModel) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
b = b[:cap(b)]
n, err := m.MarshalToSizedBuffer(b)
if err != nil {
return nil, err
}
return b[:n], nil
}
func (m *ResourceModel) XXX_Merge(src proto.Message) {
xxx_messageInfo_ResourceModel.Merge(m, src)
}
func (m *ResourceModel) XXX_Size() int {
return m.Size()
}
func (m *ResourceModel) XXX_DiscardUnknown() {
xxx_messageInfo_ResourceModel.DiscardUnknown(m)
}
var xxx_messageInfo_ResourceModel proto.InternalMessageInfo
func (m *ResourceRequest) Reset() { *m = ResourceRequest{} } func (m *ResourceRequest) Reset() { *m = ResourceRequest{} }
func (*ResourceRequest) ProtoMessage() {} func (*ResourceRequest) ProtoMessage() {}
func (*ResourceRequest) Descriptor() ([]byte, []int) { func (*ResourceRequest) Descriptor() ([]byte, []int) {
@@ -1293,7 +1293,6 @@ func init() {
proto.RegisterType((*NamedResourcesRequest)(nil), "k8s.io.api.resource.v1alpha2.NamedResourcesRequest") proto.RegisterType((*NamedResourcesRequest)(nil), "k8s.io.api.resource.v1alpha2.NamedResourcesRequest")
proto.RegisterType((*NamedResourcesResources)(nil), "k8s.io.api.resource.v1alpha2.NamedResourcesResources") proto.RegisterType((*NamedResourcesResources)(nil), "k8s.io.api.resource.v1alpha2.NamedResourcesResources")
proto.RegisterType((*NamedResourcesStringSlice)(nil), "k8s.io.api.resource.v1alpha2.NamedResourcesStringSlice") proto.RegisterType((*NamedResourcesStringSlice)(nil), "k8s.io.api.resource.v1alpha2.NamedResourcesStringSlice")
proto.RegisterType((*NodeResourceModel)(nil), "k8s.io.api.resource.v1alpha2.NodeResourceModel")
proto.RegisterType((*PodSchedulingContext)(nil), "k8s.io.api.resource.v1alpha2.PodSchedulingContext") proto.RegisterType((*PodSchedulingContext)(nil), "k8s.io.api.resource.v1alpha2.PodSchedulingContext")
proto.RegisterType((*PodSchedulingContextList)(nil), "k8s.io.api.resource.v1alpha2.PodSchedulingContextList") proto.RegisterType((*PodSchedulingContextList)(nil), "k8s.io.api.resource.v1alpha2.PodSchedulingContextList")
proto.RegisterType((*PodSchedulingContextSpec)(nil), "k8s.io.api.resource.v1alpha2.PodSchedulingContextSpec") proto.RegisterType((*PodSchedulingContextSpec)(nil), "k8s.io.api.resource.v1alpha2.PodSchedulingContextSpec")
@@ -1318,6 +1317,7 @@ func init() {
proto.RegisterType((*ResourceFilter)(nil), "k8s.io.api.resource.v1alpha2.ResourceFilter") proto.RegisterType((*ResourceFilter)(nil), "k8s.io.api.resource.v1alpha2.ResourceFilter")
proto.RegisterType((*ResourceFilterModel)(nil), "k8s.io.api.resource.v1alpha2.ResourceFilterModel") proto.RegisterType((*ResourceFilterModel)(nil), "k8s.io.api.resource.v1alpha2.ResourceFilterModel")
proto.RegisterType((*ResourceHandle)(nil), "k8s.io.api.resource.v1alpha2.ResourceHandle") proto.RegisterType((*ResourceHandle)(nil), "k8s.io.api.resource.v1alpha2.ResourceHandle")
proto.RegisterType((*ResourceModel)(nil), "k8s.io.api.resource.v1alpha2.ResourceModel")
proto.RegisterType((*ResourceRequest)(nil), "k8s.io.api.resource.v1alpha2.ResourceRequest") proto.RegisterType((*ResourceRequest)(nil), "k8s.io.api.resource.v1alpha2.ResourceRequest")
proto.RegisterType((*ResourceRequestModel)(nil), "k8s.io.api.resource.v1alpha2.ResourceRequestModel") proto.RegisterType((*ResourceRequestModel)(nil), "k8s.io.api.resource.v1alpha2.ResourceRequestModel")
proto.RegisterType((*ResourceSlice)(nil), "k8s.io.api.resource.v1alpha2.ResourceSlice") proto.RegisterType((*ResourceSlice)(nil), "k8s.io.api.resource.v1alpha2.ResourceSlice")
@@ -1331,148 +1331,148 @@ func init() {
} }
var fileDescriptor_4312f5b44a31ec02 = []byte{ var fileDescriptor_4312f5b44a31ec02 = []byte{
// 2251 bytes of a gzipped FileDescriptorProto // 2242 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xcb, 0x6f, 0x1b, 0xc7, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x1a, 0x4d, 0x6c, 0x1c, 0x57,
0x19, 0xd7, 0x92, 0xb4, 0x45, 0x7d, 0x92, 0x28, 0x69, 0x25, 0x59, 0xb4, 0xa3, 0x90, 0xcc, 0xa2, 0xd9, 0xb3, 0xbb, 0x89, 0xd7, 0x9f, 0xed, 0xb5, 0x33, 0xb6, 0xe3, 0x4d, 0xea, 0xee, 0x6e, 0x47,
0x45, 0x85, 0x56, 0x26, 0x63, 0x39, 0x71, 0x8c, 0x34, 0x2d, 0xe0, 0xb5, 0x62, 0x57, 0x68, 0xe2, 0x20, 0x2c, 0x70, 0x76, 0x1b, 0xa7, 0x4d, 0xa3, 0x52, 0x90, 0x32, 0x71, 0x13, 0x2c, 0x9a, 0xd4,
0x28, 0xc3, 0x5a, 0x89, 0xd3, 0x57, 0x56, 0xdc, 0xb1, 0xb4, 0x35, 0xb9, 0x4b, 0xef, 0x0c, 0x15, 0x7d, 0x4b, 0xdc, 0xa6, 0xfc, 0x75, 0xbc, 0xf3, 0x62, 0x0f, 0xd9, 0x9d, 0xd9, 0xcc, 0x7b, 0xeb,
0x1b, 0xbd, 0x18, 0x45, 0x5f, 0x97, 0x02, 0x29, 0x5a, 0x14, 0xed, 0xa9, 0xa7, 0xa2, 0xe8, 0xa5, 0x26, 0xe2, 0x12, 0x55, 0x20, 0xb8, 0x20, 0x15, 0x81, 0x10, 0x9c, 0x38, 0x21, 0xc4, 0x85, 0x0b,
0x97, 0xf6, 0x3f, 0x08, 0xda, 0xf8, 0x52, 0xc0, 0x45, 0x0b, 0x34, 0xe8, 0x81, 0xa8, 0xd9, 0x63, 0x5c, 0x39, 0x55, 0xd0, 0x1c, 0x83, 0x40, 0xa2, 0xe2, 0xb0, 0x22, 0xcb, 0x91, 0x23, 0xb7, 0x9e,
0x8f, 0xbd, 0xe5, 0x54, 0xec, 0xcc, 0xec, 0x63, 0x96, 0xbb, 0x14, 0x97, 0x8d, 0x05, 0xe7, 0x24, 0xd0, 0xbc, 0xf7, 0xe6, 0xe7, 0xcd, 0xce, 0xac, 0x77, 0x96, 0xc6, 0x4a, 0x4e, 0xde, 0x79, 0xef,
0xed, 0xcc, 0xf7, 0x9a, 0x6f, 0xbe, 0xc7, 0x6f, 0x66, 0x08, 0x9b, 0x77, 0x2e, 0x93, 0xba, 0xe5, 0xfb, 0x7b, 0xdf, 0xff, 0x7b, 0x9f, 0x61, 0xe3, 0xce, 0x25, 0x52, 0xb7, 0x9c, 0x86, 0xd1, 0xb5,
0x34, 0x8c, 0xae, 0xd5, 0x70, 0x31, 0x71, 0x7a, 0x6e, 0x0b, 0x37, 0x8e, 0x2e, 0x18, 0xed, 0xee, 0x1a, 0x2e, 0x26, 0x4e, 0xcf, 0x6d, 0xe1, 0xc6, 0xe1, 0x79, 0xa3, 0xdd, 0x3d, 0x30, 0x36, 0x1b,
0xa1, 0xb1, 0xd5, 0x38, 0xc0, 0x36, 0x76, 0x0d, 0x8a, 0xcd, 0x7a, 0xd7, 0x75, 0xa8, 0xa3, 0xae, 0xfb, 0xd8, 0xc6, 0xae, 0x41, 0xb1, 0x59, 0xef, 0xba, 0x0e, 0x75, 0xd4, 0x35, 0x0e, 0x5d, 0x37,
0x73, 0xea, 0xba, 0xd1, 0xb5, 0xea, 0x3e, 0x75, 0xdd, 0xa7, 0x3e, 0x77, 0xfe, 0xc0, 0xa2, 0x87, 0xba, 0x56, 0xdd, 0x87, 0xae, 0xfb, 0xd0, 0x67, 0xcf, 0xed, 0x5b, 0xf4, 0xa0, 0xb7, 0x57, 0x6f,
0xbd, 0xfd, 0x7a, 0xcb, 0xe9, 0x34, 0x0e, 0x9c, 0x03, 0xa7, 0xc1, 0x98, 0xf6, 0x7b, 0xb7, 0xd9, 0x39, 0x9d, 0xc6, 0xbe, 0xb3, 0xef, 0x34, 0x18, 0xd2, 0x5e, 0xef, 0x36, 0xfb, 0x62, 0x1f, 0xec,
0x17, 0xfb, 0x60, 0xff, 0x71, 0x61, 0xe7, 0xb4, 0x88, 0xea, 0x96, 0xe3, 0x7a, 0x6a, 0xe3, 0x0a, 0x17, 0x27, 0x76, 0x56, 0x8b, 0xb0, 0x6e, 0x39, 0xae, 0xc7, 0x36, 0xce, 0xf0, 0xec, 0x4b, 0x21,
0xcf, 0xbd, 0x10, 0xd2, 0x74, 0x8c, 0xd6, 0xa1, 0x65, 0x63, 0xf7, 0x7e, 0xa3, 0x7b, 0xe7, 0x40, 0x4c, 0xc7, 0x68, 0x1d, 0x58, 0x36, 0x76, 0xef, 0x37, 0xba, 0x77, 0xf6, 0x65, 0x79, 0xb3, 0x60,
0xb6, 0x37, 0x0b, 0x17, 0x69, 0x74, 0x30, 0x35, 0x92, 0x74, 0x35, 0xd2, 0xb8, 0xdc, 0x9e, 0x4d, 0x91, 0x46, 0x07, 0x53, 0x23, 0x89, 0x57, 0x23, 0x0d, 0xcb, 0xed, 0xd9, 0xd4, 0xea, 0x0c, 0xb3,
0xad, 0xce, 0xb0, 0x9a, 0x4b, 0xc7, 0x31, 0x90, 0xd6, 0x21, 0xee, 0x18, 0x71, 0x3e, 0xed, 0x97, 0xb9, 0x78, 0x14, 0x02, 0x69, 0x1d, 0xe0, 0x8e, 0x11, 0xc7, 0xd3, 0x7e, 0x99, 0x83, 0xc5, 0xcb,
0x39, 0x58, 0xbc, 0xd2, 0x6e, 0x3b, 0x2d, 0x83, 0x5a, 0x8e, 0x8d, 0x30, 0xe9, 0xb5, 0xa9, 0xea, 0xed, 0xb6, 0xd3, 0x32, 0xa8, 0xe5, 0xd8, 0x08, 0x93, 0x5e, 0x9b, 0xaa, 0x0e, 0x2c, 0xf8, 0xe7,
0xc0, 0x82, 0xbf, 0x9e, 0xaf, 0x18, 0xb6, 0xd9, 0xc6, 0xa4, 0xac, 0xd4, 0xf2, 0x1b, 0xb3, 0x5b, 0xf9, 0x9a, 0x61, 0x9b, 0x6d, 0x4c, 0xca, 0x4a, 0x2d, 0xbf, 0x3e, 0xbb, 0xb9, 0x51, 0x1f, 0xa5,
0x9b, 0xf5, 0x51, 0x4e, 0xaf, 0x23, 0x89, 0x49, 0x5f, 0x7b, 0xd8, 0xaf, 0x4e, 0x0d, 0xfa, 0xd5, 0xf4, 0x3a, 0x92, 0x90, 0xf4, 0xd5, 0x87, 0xfd, 0xea, 0xd4, 0xa0, 0x5f, 0x5d, 0x90, 0xd7, 0x09,
0x05, 0x79, 0x9c, 0xa0, 0xb8, 0x74, 0x75, 0x1f, 0x16, 0x8d, 0x23, 0xc3, 0x6a, 0x1b, 0xfb, 0x6d, 0x8a, 0x53, 0x57, 0xf7, 0x60, 0xd1, 0x38, 0x34, 0xac, 0xb6, 0xb1, 0xd7, 0xc6, 0x6f, 0xda, 0x37,
0xfc, 0x86, 0x7d, 0xc3, 0x31, 0x31, 0x29, 0xe7, 0x6a, 0xca, 0xc6, 0xec, 0x56, 0x2d, 0xaa, 0xd1, 0x1c, 0x13, 0x93, 0x72, 0xae, 0xa6, 0xac, 0xcf, 0x6e, 0xd6, 0xa2, 0x1c, 0x3d, 0xcb, 0xd4, 0x0f,
0xdb, 0x99, 0xfa, 0xd1, 0x85, 0xba, 0x47, 0xd0, 0xc4, 0x6d, 0xdc, 0xa2, 0x8e, 0xab, 0xaf, 0x0c, 0xcf, 0xd7, 0x3d, 0x80, 0x26, 0x6e, 0xe3, 0x16, 0x75, 0x5c, 0x7d, 0x79, 0xd0, 0xaf, 0x2e, 0x5e,
0xfa, 0xd5, 0xc5, 0x2b, 0x31, 0x6e, 0x34, 0x24, 0x4f, 0x6d, 0xc0, 0x0c, 0x39, 0x34, 0x5c, 0xec, 0x8e, 0x61, 0xa3, 0x21, 0x7a, 0x6a, 0x03, 0x66, 0xc8, 0x81, 0xe1, 0x62, 0x6f, 0xad, 0x9c, 0xaf,
0x8d, 0x95, 0xf3, 0x35, 0x65, 0xa3, 0xa8, 0x2f, 0x09, 0x03, 0x67, 0x9a, 0xfe, 0x04, 0x0a, 0x69, 0x29, 0xeb, 0x45, 0xfd, 0x94, 0x10, 0x70, 0xa6, 0xe9, 0x6f, 0xa0, 0x10, 0x46, 0xfb, 0xa9, 0x02,
0xb4, 0x9f, 0x2a, 0xb0, 0x1a, 0x77, 0xcd, 0xeb, 0x8e, 0x89, 0xdb, 0xea, 0x3d, 0x28, 0xd9, 0x46, 0x2b, 0x71, 0xd5, 0x5c, 0x77, 0x4c, 0xdc, 0x56, 0xef, 0x41, 0xc9, 0x36, 0x3a, 0xd8, 0xf4, 0xcf,
0x07, 0x9b, 0xfe, 0xba, 0x3c, 0xf7, 0x78, 0xc6, 0xbe, 0x32, 0xda, 0x3d, 0x37, 0x24, 0x9e, 0xb8, 0xe5, 0xa9, 0xc7, 0x13, 0xf6, 0xb5, 0xd1, 0xea, 0xb9, 0x21, 0xe1, 0xc4, 0x49, 0xeb, 0xea, 0xa0,
0x68, 0x5d, 0x1d, 0xf4, 0xab, 0x25, 0x99, 0x06, 0xc5, 0xf4, 0x68, 0xbf, 0xcf, 0xc1, 0x99, 0x6d, 0x5f, 0x2d, 0xc9, 0x30, 0x28, 0xc6, 0x47, 0xfb, 0x7d, 0x0e, 0x4e, 0x6f, 0xb9, 0xd6, 0x21, 0x76,
0xd7, 0x3a, 0xc2, 0xee, 0xd0, 0xa6, 0xfd, 0x58, 0x81, 0xb5, 0x23, 0x6c, 0x9b, 0x8e, 0x8b, 0xf0, 0x87, 0x8c, 0xf6, 0x63, 0x05, 0x56, 0x0f, 0xb1, 0x6d, 0x3a, 0x2e, 0xc2, 0x77, 0x7b, 0x98, 0xd0,
0xdd, 0x1e, 0x26, 0x74, 0xd7, 0x70, 0x8d, 0x0e, 0xa6, 0xd8, 0xf5, 0xcd, 0x3b, 0x1f, 0x31, 0x2f, 0x1d, 0xc3, 0x35, 0x3a, 0x98, 0x62, 0xd7, 0x17, 0xef, 0x5c, 0x44, 0xbc, 0xc0, 0x49, 0xea, 0xdd,
0x08, 0x92, 0x7a, 0xf7, 0xce, 0x41, 0x5d, 0x04, 0x49, 0x1d, 0x19, 0xef, 0xbd, 0x7a, 0x8f, 0x62, 0x3b, 0xfb, 0x75, 0xe1, 0x24, 0x75, 0x64, 0xbc, 0xff, 0xfa, 0x3d, 0x8a, 0x6d, 0x62, 0x39, 0xb6,
0x9b, 0x58, 0x8e, 0xad, 0x57, 0x85, 0x77, 0xd6, 0xf6, 0x92, 0xa5, 0xa2, 0x34, 0x75, 0x9e, 0x29, 0x5e, 0x15, 0xda, 0x59, 0xdd, 0x4d, 0xa6, 0x8a, 0xd2, 0xd8, 0x79, 0xa2, 0xac, 0x18, 0x49, 0x9a,
0xab, 0x46, 0x92, 0xe7, 0xc4, 0xa6, 0x5e, 0x1c, 0xed, 0xa7, 0x44, 0xa7, 0xeb, 0xcf, 0x0a, 0x73, 0x13, 0x46, 0xbd, 0x30, 0x5a, 0x4f, 0x89, 0x4a, 0xd7, 0x9f, 0x17, 0xe2, 0x24, 0xdb, 0x04, 0x25,
0x92, 0xf7, 0x04, 0x25, 0x2b, 0xd4, 0x7e, 0x91, 0x83, 0x12, 0x77, 0x98, 0x30, 0x93, 0xa8, 0x5b, 0x33, 0xd4, 0x7e, 0x91, 0x83, 0x12, 0x57, 0x98, 0x10, 0x93, 0xa8, 0x9b, 0x00, 0x26, 0x5b, 0xf1,
0x00, 0x26, 0x1b, 0xf1, 0x7c, 0xcd, 0x5c, 0x33, 0xa3, 0xab, 0x42, 0x38, 0x6c, 0x07, 0x33, 0x28, 0x74, 0xcd, 0x54, 0x33, 0xa3, 0xab, 0x82, 0x38, 0x6c, 0x05, 0x3b, 0x28, 0x02, 0xa5, 0x12, 0x58,
0x42, 0xa5, 0x12, 0x58, 0xe4, 0x8b, 0x8d, 0x38, 0x35, 0x37, 0x89, 0x53, 0xcb, 0x42, 0xd1, 0xe2, 0xe4, 0x87, 0x8d, 0x28, 0x35, 0x37, 0x89, 0x52, 0xcb, 0x82, 0xd1, 0xe2, 0x6e, 0x8c, 0x1c, 0x1a,
0x5e, 0x4c, 0x1c, 0x1a, 0x52, 0xa0, 0x7e, 0x1d, 0x8a, 0xae, 0x30, 0xba, 0x9c, 0x67, 0xf9, 0x77, 0x62, 0xa0, 0x7e, 0x13, 0x8a, 0xae, 0x10, 0xba, 0x9c, 0x67, 0xf1, 0x77, 0x6e, 0xbc, 0xf8, 0x13,
0x7e, 0xbc, 0xfc, 0x13, 0x4b, 0xd5, 0x17, 0x85, 0xb2, 0xa2, 0xbf, 0x76, 0x14, 0x08, 0xd4, 0x74, 0x47, 0xd5, 0x17, 0x05, 0xb3, 0xa2, 0x7f, 0x76, 0x14, 0x10, 0xd4, 0x74, 0xa8, 0x8c, 0xf6, 0x47,
0xa8, 0x8c, 0x8e, 0x47, 0xb5, 0x06, 0x05, 0x3b, 0xf4, 0xd0, 0x9c, 0x90, 0x55, 0x60, 0xbe, 0x61, 0xb5, 0x06, 0x05, 0x3b, 0xd4, 0xd0, 0x9c, 0xa0, 0x55, 0x60, 0xba, 0x61, 0x3b, 0xda, 0x5f, 0x14,
0x33, 0xda, 0x9f, 0x15, 0x58, 0x8b, 0x09, 0xa1, 0xd4, 0xb5, 0xf6, 0x7b, 0x14, 0x1f, 0xcf, 0xed, 0x58, 0x8d, 0x11, 0xa1, 0xd4, 0xb5, 0xf6, 0x7a, 0x14, 0x1f, 0x8d, 0xed, 0x79, 0x49, 0xc9, 0xf0,
0x45, 0x49, 0xc9, 0xf0, 0xe9, 0xf7, 0x8c, 0x76, 0x0f, 0x0b, 0x97, 0xbe, 0x9c, 0x29, 0x8d, 0x24, 0xe1, 0x77, 0x8d, 0x76, 0x0f, 0x0b, 0x95, 0xbe, 0x9a, 0x29, 0x8c, 0x24, 0x0a, 0xfa, 0xe7, 0x04,
0x09, 0xfa, 0x67, 0x84, 0xa2, 0xf5, 0x51, 0x54, 0x28, 0xa6, 0x57, 0xfb, 0x4f, 0x1e, 0x46, 0x32, 0xa3, 0xb5, 0x51, 0x50, 0x28, 0xc6, 0x57, 0xfb, 0x4f, 0x1e, 0x46, 0x22, 0xa8, 0xdf, 0x86, 0xe2,
0xa8, 0xdf, 0x84, 0xe2, 0xdd, 0x9e, 0x61, 0x53, 0x8b, 0xde, 0x2f, 0x9f, 0x66, 0x46, 0xd6, 0x53, 0xdd, 0x9e, 0x61, 0x53, 0x8b, 0xde, 0x2f, 0x9f, 0x64, 0x42, 0xd6, 0x53, 0xed, 0x2e, 0x49, 0xfd,
0xf7, 0x5d, 0xb2, 0xfa, 0x4d, 0xc1, 0xa5, 0x2f, 0x0d, 0xfa, 0xd5, 0x79, 0xff, 0x8b, 0x5b, 0x11, 0x96, 0xc0, 0xd2, 0x4f, 0x0d, 0xfa, 0xd5, 0x79, 0xff, 0x8b, 0x4b, 0x11, 0x90, 0x54, 0x5f, 0x80,
0x88, 0x54, 0x9f, 0x83, 0xc2, 0xbe, 0xe3, 0xf0, 0xf4, 0x28, 0xea, 0xf3, 0x5e, 0x49, 0xd2, 0x1d, 0xc2, 0x9e, 0xe3, 0xf0, 0xf0, 0x28, 0xea, 0xf3, 0x5e, 0x4a, 0xd2, 0x1d, 0xa7, 0xcd, 0xc1, 0xd8,
0xa7, 0xcd, 0xc9, 0xd8, 0x94, 0x5a, 0x81, 0xbc, 0x65, 0xd3, 0xf2, 0x74, 0x4d, 0xd9, 0xc8, 0xeb, 0x96, 0x5a, 0x81, 0xbc, 0x65, 0xd3, 0xf2, 0x74, 0x4d, 0x59, 0xcf, 0xeb, 0x73, 0x9e, 0x51, 0xb7,
0x73, 0xde, 0xa6, 0xee, 0xd8, 0x94, 0x13, 0x78, 0x13, 0x6a, 0x0b, 0x8a, 0x96, 0x4d, 0x9b, 0x6d, 0x6d, 0xca, 0x01, 0xbc, 0x0d, 0xb5, 0x05, 0x45, 0xcb, 0xa6, 0xcd, 0xb6, 0xd5, 0xc2, 0xe5, 0x22,
0xab, 0x85, 0xcb, 0x45, 0x66, 0xe1, 0x0b, 0x59, 0xdc, 0xb8, 0x23, 0x78, 0xb9, 0x9d, 0xfe, 0x97, 0x93, 0xf0, 0xa5, 0x2c, 0x6a, 0xdc, 0x16, 0xb8, 0x5c, 0x4e, 0xff, 0x4b, 0xc8, 0xe9, 0x13, 0x56,
0xb0, 0xd3, 0x17, 0xac, 0x7e, 0x0e, 0x4e, 0x13, 0xea, 0x5a, 0xf6, 0x41, 0xf9, 0x14, 0xdb, 0xd6, 0xbf, 0x00, 0x27, 0x09, 0x75, 0x2d, 0x7b, 0xbf, 0x7c, 0x82, 0x99, 0x75, 0x61, 0xd0, 0xaf, 0xce,
0x85, 0x41, 0xbf, 0x3a, 0xdb, 0x64, 0x23, 0x9c, 0x54, 0x4c, 0xab, 0x0e, 0xcc, 0xf2, 0xff, 0xb8, 0x36, 0xd9, 0x0a, 0x07, 0x15, 0xdb, 0xaa, 0x03, 0xb3, 0xfc, 0x17, 0x17, 0x68, 0x86, 0x09, 0xf4,
0x41, 0x33, 0xcc, 0xa0, 0x97, 0xb2, 0x18, 0xd4, 0x0c, 0xd9, 0x79, 0x89, 0x8f, 0x0c, 0x70, 0x5d, 0x4a, 0x16, 0x81, 0x9a, 0x21, 0x3a, 0x4f, 0xf1, 0x91, 0x05, 0xce, 0x2b, 0xca, 0x41, 0xfd, 0x22,
0x51, 0x0d, 0xea, 0xe7, 0x61, 0xfa, 0x08, 0xbb, 0x5e, 0x8a, 0x95, 0x81, 0x99, 0xb6, 0x38, 0xe8, 0x4c, 0x1f, 0x62, 0xd7, 0x0b, 0xb1, 0x32, 0x30, 0xd1, 0x16, 0x07, 0xfd, 0xea, 0xdc, 0x2e, 0x5f,
0x57, 0xe7, 0xf6, 0xf8, 0x10, 0xa7, 0xf7, 0x09, 0xb4, 0x6d, 0x58, 0x91, 0x75, 0x5d, 0xb3, 0xda, 0xe2, 0xf0, 0x3e, 0x80, 0xb6, 0x05, 0xcb, 0x32, 0xaf, 0xab, 0x56, 0x9b, 0x62, 0x57, 0xdd, 0x80,
0x14, 0xbb, 0xea, 0x26, 0x14, 0x89, 0xe8, 0x2a, 0x22, 0x6c, 0x83, 0x04, 0xf2, 0xbb, 0x0d, 0x0a, 0x22, 0x11, 0x55, 0x45, 0xb8, 0x6d, 0x10, 0x40, 0x7e, 0xb5, 0x41, 0x01, 0x84, 0xf6, 0x1b, 0x05,
0x28, 0xb4, 0xdf, 0x28, 0x70, 0x26, 0xee, 0x43, 0x42, 0x0d, 0xbb, 0x35, 0x4e, 0xec, 0x5b, 0x00, 0x4e, 0xc7, 0x75, 0x48, 0xa8, 0x61, 0xb7, 0xc6, 0xf1, 0x7d, 0x0b, 0x20, 0x70, 0x41, 0x2f, 0x93,
0x41, 0x08, 0x7a, 0x95, 0xc4, 0x4b, 0xee, 0x17, 0x27, 0x0a, 0xfb, 0xb0, 0x74, 0x05, 0x43, 0x04, 0x78, 0xc1, 0xfd, 0xf2, 0x44, 0x6e, 0x1f, 0xa6, 0xae, 0x60, 0x89, 0xa0, 0x08, 0x71, 0xed, 0xe2,
0x45, 0x84, 0x6b, 0x97, 0x86, 0xcd, 0x14, 0xbb, 0xb9, 0x0e, 0x05, 0xcb, 0xa6, 0xbc, 0xb7, 0xe7, 0xb0, 0x98, 0xc2, 0x9a, 0x6b, 0x50, 0xb0, 0x6c, 0xca, 0x6b, 0x7b, 0x5e, 0x2f, 0x7a, 0x22, 0x6e,
0xf5, 0xa2, 0x67, 0xe2, 0x8e, 0x4d, 0x09, 0x62, 0xa3, 0xda, 0xab, 0xb0, 0x1a, 0x6b, 0x46, 0xbc, 0xdb, 0x94, 0x20, 0xb6, 0xaa, 0xbd, 0x0e, 0x2b, 0xb1, 0x62, 0xc4, 0x53, 0x47, 0x46, 0x35, 0x3d,
0x74, 0x64, 0x74, 0xd3, 0x83, 0xa1, 0x1a, 0x11, 0xfc, 0xa3, 0x62, 0x98, 0xb1, 0x84, 0xcf, 0x7c, 0x18, 0xca, 0x11, 0xc1, 0x0f, 0x15, 0xc3, 0x8c, 0x25, 0x74, 0xe6, 0x77, 0x18, 0x19, 0x9d, 0x96,
0x84, 0x91, 0x31, 0x68, 0x39, 0x73, 0xd8, 0xc8, 0xfd, 0x11, 0x82, 0x42, 0xc9, 0x9a, 0x0e, 0x67, 0x23, 0x87, 0x85, 0xdc, 0x5f, 0x21, 0x28, 0xa4, 0xac, 0xe9, 0x70, 0x26, 0xd5, 0xb7, 0xd4, 0xcf,
0x53, 0x63, 0x4b, 0xfd, 0x2c, 0x4c, 0xf3, 0x38, 0xe2, 0x16, 0xcc, 0xe8, 0xb3, 0x83, 0x7e, 0x75, 0xc3, 0x34, 0xf7, 0x23, 0x2e, 0xc1, 0x8c, 0x3e, 0x3b, 0xe8, 0x57, 0xa7, 0x39, 0x04, 0x41, 0xfe,
0x9a, 0x53, 0x10, 0xe4, 0xcf, 0x69, 0x3f, 0x54, 0x60, 0xc9, 0xc3, 0x11, 0xbe, 0x0c, 0x0e, 0x04, 0x9e, 0xf6, 0xc7, 0x1c, 0x2c, 0xef, 0x38, 0x66, 0xb3, 0x75, 0x80, 0xcd, 0x5e, 0xdb, 0xb2, 0xf7,
0xee, 0xa6, 0x00, 0x81, 0x4c, 0x5b, 0x19, 0xfc, 0x33, 0x16, 0x02, 0xf8, 0x63, 0x0e, 0x56, 0x76, 0xaf, 0x38, 0x36, 0xc5, 0xf7, 0xa8, 0xfa, 0x1e, 0x14, 0xbd, 0x26, 0xce, 0x34, 0xa8, 0x21, 0xca,
0x1d, 0xb3, 0xd9, 0x3a, 0xc4, 0x66, 0xaf, 0x6d, 0xd9, 0x07, 0x57, 0x1d, 0x9b, 0xe2, 0x7b, 0x54, 0xec, 0x8b, 0xa3, 0x32, 0x03, 0xa9, 0x7b, 0xd0, 0x5e, 0x13, 0xf3, 0xe6, 0xde, 0xf7, 0x70, 0x8b,
0x7d, 0x17, 0x8a, 0x1e, 0x9a, 0x34, 0x0d, 0x6a, 0x08, 0x2b, 0x9e, 0x1f, 0x55, 0xa2, 0x48, 0xdd, 0x5e, 0xc7, 0xd4, 0x08, 0x4d, 0x18, 0xae, 0xa1, 0x80, 0xaa, 0xfa, 0x0e, 0x14, 0x48, 0x17, 0xb7,
0xa3, 0xf6, 0xd0, 0xd4, 0x1b, 0xfb, 0xdf, 0xc1, 0x2d, 0xfa, 0x3a, 0xa6, 0x46, 0x18, 0x4b, 0xe1, 0x44, 0x72, 0xbc, 0x38, 0x5a, 0x41, 0x49, 0x32, 0x36, 0xbb, 0xb8, 0x15, 0x7a, 0xa1, 0xf7, 0x85,
0x18, 0x0a, 0xa4, 0xaa, 0x6f, 0x43, 0x81, 0x74, 0x71, 0x4b, 0x54, 0xe9, 0x4b, 0xa3, 0xd7, 0x98, 0x18, 0x45, 0xf5, 0x3d, 0x2f, 0x9c, 0x0d, 0xda, 0x23, 0xac, 0x1f, 0x9a, 0xdd, 0xbc, 0x34, 0x01,
0x64, 0x63, 0xb3, 0x8b, 0x5b, 0x61, 0x3a, 0x78, 0x5f, 0x88, 0x49, 0x54, 0xdf, 0xf5, 0xea, 0x8a, 0x6d, 0x86, 0xaf, 0x97, 0x04, 0xf5, 0x93, 0xfc, 0x1b, 0x09, 0xba, 0xda, 0x5f, 0x15, 0x28, 0x27,
0x41, 0x7b, 0x84, 0x01, 0xb3, 0xd9, 0xad, 0xcb, 0x13, 0xc8, 0x66, 0xfc, 0x7a, 0x49, 0x48, 0x3f, 0xa1, 0xbd, 0x61, 0x11, 0xaa, 0x7e, 0x6b, 0x48, 0x75, 0xf5, 0xf1, 0x54, 0xe7, 0x61, 0x33, 0xc5,
0xcd, 0xbf, 0x91, 0x90, 0xab, 0xfd, 0x55, 0x81, 0x72, 0x12, 0xdb, 0x6b, 0x16, 0xa1, 0xea, 0x37, 0x05, 0x8e, 0xe7, 0xaf, 0x44, 0xd4, 0xf6, 0x36, 0x9c, 0xb0, 0x28, 0xee, 0xf8, 0xd1, 0xb5, 0x99,
0x86, 0x5c, 0x57, 0x1f, 0xcf, 0x75, 0x1e, 0x37, 0x73, 0x5c, 0x90, 0x01, 0xfe, 0x48, 0xc4, 0x6d, 0xfd, 0x6c, 0xfa, 0xbc, 0x20, 0x7f, 0x62, 0xdb, 0x23, 0x84, 0x38, 0x3d, 0xed, 0xc3, 0x94, 0x33,
0x6f, 0xc1, 0x29, 0x8b, 0xe2, 0x8e, 0x9f, 0xe6, 0x5b, 0xd9, 0xd7, 0xa6, 0xcf, 0x0b, 0xf1, 0xa7, 0x79, 0x8a, 0x55, 0x2f, 0xc1, 0x1c, 0x77, 0x7d, 0x6c, 0x7a, 0x6d, 0xa7, 0x08, 0x90, 0x65, 0x41,
0x76, 0x3c, 0x41, 0x88, 0xcb, 0xd3, 0xde, 0x4f, 0x59, 0x93, 0xe7, 0x58, 0xf5, 0x32, 0xcc, 0xf1, 0x68, 0xae, 0x19, 0xd9, 0x43, 0x12, 0xa4, 0xfa, 0x2a, 0x94, 0xba, 0x0e, 0xc5, 0x36, 0xb5, 0x8c,
0x1c, 0xc4, 0xa6, 0x17, 0xb7, 0x22, 0x53, 0x57, 0x84, 0xa0, 0xb9, 0x66, 0x64, 0x0e, 0x49, 0x94, 0xb6, 0xdf, 0x01, 0x7b, 0xfe, 0xc8, 0xda, 0xc2, 0x1d, 0x69, 0x07, 0xc5, 0x20, 0xb5, 0x5f, 0x29,
0xea, 0xcb, 0x50, 0xea, 0x3a, 0x14, 0xdb, 0xd4, 0x32, 0xda, 0x3e, 0x14, 0xf7, 0x12, 0x83, 0x45, 0x70, 0x36, 0xdd, 0x3a, 0xea, 0xf7, 0xa1, 0xe4, 0x9f, 0xf8, 0x4a, 0xdb, 0xb0, 0x3a, 0x7e, 0xb0,
0xe7, 0xae, 0x34, 0x83, 0x62, 0x94, 0xda, 0xaf, 0x14, 0x38, 0x97, 0xbe, 0x3b, 0xea, 0x77, 0xa1, 0x7d, 0x79, 0xbc, 0x76, 0x82, 0xe1, 0x84, 0xb4, 0x85, 0xc9, 0x4f, 0x8b, 0x33, 0x95, 0x24, 0x30,
0xe4, 0xaf, 0xf8, 0x6a, 0xdb, 0xb0, 0x3a, 0x7e, 0xd6, 0x7f, 0x71, 0x3c, 0x5c, 0xc3, 0x78, 0x42, 0x82, 0x62, 0xac, 0xb4, 0x5f, 0xe7, 0x60, 0x5e, 0x02, 0x39, 0x86, 0x90, 0x79, 0x4b, 0x0a, 0x99,
0xd9, 0x62, 0xcb, 0xcf, 0x88, 0x35, 0x95, 0x24, 0x32, 0x82, 0x62, 0xaa, 0xb4, 0x5f, 0xe7, 0x60, 0x46, 0x96, 0x63, 0xa6, 0xc5, 0xca, 0xad, 0x58, 0xac, 0x9c, 0xcf, 0x42, 0x74, 0x74, 0x90, 0x0c,
0x5e, 0x22, 0x39, 0x81, 0x94, 0x79, 0x53, 0x4a, 0x99, 0x46, 0x96, 0x65, 0xa6, 0xe5, 0xca, 0xad, 0x14, 0xa8, 0x48, 0xf0, 0x57, 0x1c, 0x9b, 0xf4, 0x3a, 0x5e, 0xcb, 0x7a, 0x1b, 0xbb, 0xd8, 0xab,
0x58, 0xae, 0x5c, 0xc8, 0x22, 0x74, 0x74, 0x92, 0x0c, 0x14, 0xa8, 0x48, 0xf4, 0x57, 0x1d, 0x9b, 0x28, 0x1b, 0x50, 0x34, 0xba, 0xd6, 0x35, 0xd7, 0xe9, 0x75, 0xe3, 0x39, 0xf7, 0xf2, 0xce, 0x36,
0xf4, 0x3a, 0x1e, 0x76, 0xbe, 0x8d, 0x5d, 0xec, 0xb5, 0xb6, 0x4d, 0x28, 0x1a, 0x5d, 0xeb, 0xba, 0x5b, 0x47, 0x01, 0x84, 0x07, 0xed, 0x4b, 0xc4, 0xa4, 0x9d, 0x89, 0x76, 0x82, 0xa2, 0x45, 0x0c,
0xeb, 0xf4, 0xba, 0xf1, 0xe2, 0x7f, 0x65, 0x77, 0x87, 0x8d, 0xa3, 0x80, 0xc2, 0xa3, 0xf6, 0x2d, 0x20, 0x82, 0x6a, 0x55, 0x48, 0xad, 0x56, 0x3a, 0xe4, 0x7b, 0x96, 0x29, 0x6a, 0xfe, 0x8b, 0x02,
0x62, 0xd6, 0xce, 0x44, 0x21, 0xa9, 0xc0, 0xaa, 0x01, 0x45, 0xd0, 0x36, 0x0b, 0xa9, 0x6d, 0x53, 0x20, 0x7f, 0x73, 0x7b, 0xeb, 0xd3, 0x7e, 0xf5, 0x85, 0xb4, 0x8b, 0x27, 0xbd, 0xdf, 0xc5, 0xa4,
0x87, 0x7c, 0xcf, 0x32, 0x05, 0xf8, 0x78, 0x5e, 0x10, 0xe4, 0x6f, 0xee, 0x6c, 0x7f, 0xdc, 0xaf, 0x7e, 0x73, 0x7b, 0x0b, 0x79, 0xc8, 0xda, 0x47, 0x0a, 0x9c, 0x92, 0x0e, 0x79, 0x0c, 0x29, 0x60,
0x3e, 0x97, 0x76, 0x02, 0xa6, 0xf7, 0xbb, 0x98, 0xd4, 0x6f, 0xee, 0x6c, 0x23, 0x8f, 0x59, 0xfb, 0x47, 0x4e, 0x01, 0x5f, 0xca, 0x60, 0xb2, 0x94, 0xd8, 0xff, 0x59, 0x1e, 0x56, 0x25, 0xb8, 0x48,
0x40, 0x81, 0x25, 0x69, 0x91, 0x27, 0x50, 0x02, 0x76, 0xe5, 0x12, 0xf0, 0x85, 0x0c, 0x5b, 0x96, 0xbb, 0xfe, 0xe4, 0xdd, 0xfa, 0x7d, 0x98, 0x0f, 0xee, 0xef, 0x57, 0x5d, 0xa7, 0x23, 0xfc, 0xfb,
0x92, 0xfb, 0x3f, 0xcb, 0xc3, 0x9a, 0x44, 0x17, 0x39, 0x37, 0x3c, 0xf9, 0xb0, 0x7e, 0x0f, 0xe6, 0xab, 0x19, 0xce, 0x15, 0xb9, 0x70, 0xf8, 0xce, 0xc5, 0x5b, 0xbe, 0x6b, 0x51, 0xc2, 0x48, 0xe6,
0x83, 0x8b, 0x84, 0x6b, 0xae, 0xd3, 0x11, 0xf1, 0xfd, 0xe5, 0x0c, 0xeb, 0x8a, 0x9c, 0x7c, 0xfc, 0x93, 0xf9, 0xee, 0xac, 0xb6, 0xa1, 0x64, 0x4a, 0xb7, 0xae, 0x72, 0x61, 0x9c, 0x07, 0x04, 0xf9,
0xe0, 0xe2, 0xd8, 0xf3, 0x7a, 0x54, 0x30, 0x92, 0xf5, 0x64, 0x3e, 0xc4, 0xab, 0x6d, 0x28, 0x99, 0xa6, 0x16, 0xa6, 0x18, 0x79, 0x1d, 0xc5, 0x68, 0x6b, 0xff, 0x50, 0xe0, 0xb9, 0x94, 0x53, 0x1e,
0xd2, 0xf1, 0xaf, 0x5c, 0x18, 0xe7, 0x26, 0x43, 0x3e, 0x32, 0x86, 0x25, 0x46, 0x1e, 0x47, 0x31, 0x83, 0x97, 0xbd, 0x2b, 0x7b, 0xd9, 0xcb, 0x13, 0x59, 0x23, 0xc5, 0xdf, 0x7e, 0xae, 0x40, 0xed,
0xd9, 0xda, 0x3f, 0x14, 0x78, 0x26, 0x65, 0x95, 0x27, 0x10, 0x65, 0xef, 0xc8, 0x51, 0xf6, 0xe2, 0x28, 0xfb, 0x65, 0x4c, 0x0e, 0x35, 0x28, 0xdc, 0xb1, 0x6c, 0x93, 0xf9, 0x4e, 0x24, 0xdc, 0xbf,
0x44, 0xbb, 0x91, 0x12, 0x6f, 0x3f, 0x57, 0xa0, 0x76, 0xdc, 0xfe, 0x65, 0x2c, 0x0e, 0x35, 0x28, 0x6e, 0xd9, 0x26, 0x62, 0x3b, 0x41, 0x42, 0xc8, 0xa7, 0x5e, 0xfc, 0x1e, 0x28, 0xf0, 0xfc, 0xc8,
0xdc, 0xb1, 0x6c, 0x93, 0xc5, 0x4e, 0x24, 0xdd, 0xbf, 0x6a, 0xd9, 0x26, 0x62, 0x33, 0x41, 0x41, 0xea, 0x30, 0x46, 0x0b, 0xfc, 0x15, 0x58, 0xe8, 0xd9, 0xa4, 0x67, 0x51, 0xcf, 0x61, 0xa2, 0x05,
0xc8, 0xa7, 0x9e, 0x40, 0x1f, 0x28, 0xf0, 0xec, 0xc8, 0xee, 0x30, 0x06, 0x16, 0xff, 0x12, 0x2c, 0x6f, 0x69, 0xd0, 0xaf, 0x2e, 0xdc, 0x94, 0xb7, 0x50, 0x1c, 0x56, 0xfb, 0x6d, 0x2e, 0x96, 0x4f,
0xf4, 0x6c, 0xd2, 0xb3, 0xa8, 0x17, 0x30, 0xd1, 0x86, 0xb7, 0x3c, 0xe8, 0x57, 0x17, 0x6e, 0xca, 0x58, 0xf9, 0xbd, 0x06, 0xa7, 0x22, 0xe5, 0x87, 0x90, 0xc8, 0x15, 0xff, 0x8c, 0x90, 0x21, 0x8a,
0x53, 0x28, 0x4e, 0xab, 0xfd, 0x36, 0x17, 0xab, 0x27, 0xac, 0xfd, 0x5e, 0x87, 0xa5, 0x48, 0xfb, 0xc5, 0x01, 0xd0, 0x30, 0x8e, 0x17, 0x6a, 0xdd, 0xa8, 0xaa, 0x3f, 0xcb, 0x50, 0x93, 0x36, 0x90,
0x21, 0x24, 0x72, 0xd7, 0x70, 0x56, 0xd8, 0x10, 0xe5, 0xe2, 0x04, 0x68, 0x98, 0xc7, 0x4b, 0xb5, 0xcc, 0x47, 0xdd, 0x81, 0x52, 0xf8, 0x92, 0x71, 0xdd, 0x6b, 0x21, 0xb8, 0x19, 0xd6, 0xfd, 0x58,
0x6e, 0xd4, 0xd5, 0x9f, 0x64, 0xaa, 0x49, 0x13, 0x48, 0xd6, 0xa3, 0xee, 0x42, 0x29, 0xbc, 0x52, 0xb8, 0x2c, 0xed, 0x7e, 0x3a, 0xb4, 0x82, 0x62, 0xf8, 0xda, 0x7f, 0x73, 0xb0, 0x94, 0x50, 0x8e,
0xf1, 0xe0, 0xae, 0xd8, 0x86, 0x0d, 0x3f, 0x17, 0xae, 0x48, 0xb3, 0x1f, 0x0f, 0x8d, 0xa0, 0x18, 0x26, 0x7a, 0x07, 0xf9, 0x0e, 0x40, 0x48, 0x5d, 0xe8, 0xa4, 0x9e, 0xed, 0x35, 0x47, 0x2f, 0xb1,
0xbf, 0xf6, 0xdf, 0x1c, 0x2c, 0x27, 0xb4, 0xa3, 0x89, 0x2e, 0x64, 0xbe, 0x05, 0x10, 0x4a, 0x17, 0xcb, 0x4a, 0xb8, 0x1a, 0xa1, 0xa8, 0x12, 0x98, 0x75, 0x31, 0xc1, 0xee, 0x21, 0x36, 0xaf, 0x3a,
0x3e, 0xa9, 0x67, 0xbb, 0x56, 0xd2, 0x4b, 0xec, 0xd4, 0x14, 0x8e, 0x46, 0x24, 0xaa, 0x04, 0x66, 0xae, 0x78, 0xf5, 0x78, 0x2d, 0x83, 0xd2, 0x87, 0x4a, 0xa7, 0xbe, 0x24, 0x8e, 0x34, 0x8b, 0x42,
0x5d, 0x4c, 0xb0, 0x7b, 0x84, 0xcd, 0x6b, 0x8e, 0x2b, 0xae, 0x5f, 0x5e, 0xc9, 0xe0, 0xf4, 0xa1, 0xc2, 0x28, 0xca, 0x45, 0x6d, 0xc2, 0x8a, 0x89, 0xa3, 0xcf, 0x47, 0x2c, 0xad, 0x60, 0x93, 0x55,
0xd6, 0xa9, 0x2f, 0x8b, 0x25, 0xcd, 0xa2, 0x50, 0x30, 0x8a, 0x6a, 0x51, 0x9b, 0xb0, 0x6a, 0xe2, 0xc4, 0x62, 0xf8, 0xf0, 0xb4, 0x95, 0x04, 0x84, 0x92, 0x71, 0xb5, 0xbf, 0x2b, 0xb0, 0x22, 0x49,
0xe8, 0x3d, 0x16, 0x2b, 0x2b, 0xd8, 0x64, 0x1d, 0xb1, 0x18, 0xde, 0x80, 0x6d, 0x27, 0x11, 0xa1, 0xf6, 0x0d, 0xdc, 0xe9, 0xb6, 0x0d, 0x8a, 0x8f, 0xa1, 0x4e, 0xdc, 0x92, 0xda, 0x9f, 0x57, 0x32,
0x64, 0x5e, 0xed, 0xef, 0x0a, 0xac, 0x4a, 0x96, 0x7d, 0x0d, 0x77, 0xba, 0x6d, 0x83, 0xe2, 0x13, 0xa8, 0xcf, 0x17, 0x32, 0xad, 0x0d, 0xd2, 0xfe, 0xa6, 0xc0, 0x99, 0x44, 0x8c, 0x63, 0x48, 0xb4,
0xe8, 0x13, 0xb7, 0x24, 0xf8, 0xf3, 0x52, 0x06, 0xf7, 0xf9, 0x46, 0xa6, 0xc1, 0x20, 0xed, 0x6f, 0xef, 0xc8, 0x89, 0xf6, 0xc2, 0x04, 0xe7, 0x4a, 0x49, 0xb3, 0x8f, 0xd2, 0x4e, 0xd5, 0xe4, 0xd7,
0x0a, 0x9c, 0x4d, 0xe4, 0x38, 0x81, 0x42, 0xfb, 0xb6, 0x5c, 0x68, 0x2f, 0x4e, 0xb0, 0xae, 0x94, 0xa4, 0x67, 0xaf, 0x5f, 0xd5, 0x3e, 0xce, 0x4b, 0x6d, 0x37, 0x39, 0x8e, 0xfe, 0x44, 0xce, 0x28,
0x32, 0xfb, 0x28, 0x6d, 0x55, 0x4d, 0x7e, 0x4c, 0xfa, 0xf4, 0xe1, 0x55, 0xed, 0xc3, 0xbc, 0x04, 0xb9, 0xb1, 0x32, 0xca, 0x50, 0xa2, 0xcd, 0x67, 0x4c, 0xb4, 0x84, 0x4c, 0x96, 0x68, 0x6f, 0xc1,
0xbb, 0xc9, 0x49, 0xe0, 0x13, 0xb9, 0xa2, 0xe4, 0xc6, 0xaa, 0x28, 0x43, 0x85, 0x36, 0x9f, 0xb1, 0xbc, 0x5c, 0x7d, 0x0a, 0x63, 0x0e, 0x1c, 0x18, 0xe9, 0xa6, 0x54, 0x9d, 0x64, 0x4a, 0xea, 0x1b,
0xd0, 0x12, 0x32, 0x59, 0xa1, 0xbd, 0x05, 0xf3, 0x72, 0xf7, 0x29, 0x8c, 0xf9, 0xf2, 0xc1, 0x44, 0xb0, 0x4c, 0xa8, 0xdb, 0x6b, 0xd1, 0x9e, 0x8b, 0xcd, 0xc8, 0x8b, 0xf1, 0x09, 0x96, 0x4f, 0xca,
0x37, 0xa5, 0xee, 0x24, 0x4b, 0x52, 0x5f, 0x83, 0x15, 0x42, 0xdd, 0x5e, 0x8b, 0xf6, 0x5c, 0x6c, 0x83, 0x7e, 0x75, 0xb9, 0x99, 0xb0, 0x8f, 0x12, 0xb1, 0xe2, 0x9d, 0x33, 0x21, 0x4f, 0x73, 0xe7,
0x46, 0xae, 0xae, 0x4f, 0xb1, 0x7a, 0x52, 0x1e, 0xf4, 0xab, 0x2b, 0xcd, 0x84, 0x79, 0x94, 0xc8, 0x4c, 0xd2, 0x3a, 0x99, 0x8f, 0xe4, 0xce, 0x39, 0x6a, 0xb5, 0x67, 0xa1, 0x73, 0x1e, 0xe1, 0x65,
0x15, 0x47, 0xce, 0x84, 0x3c, 0xcd, 0xc8, 0x99, 0xa4, 0x21, 0x99, 0x0f, 0x64, 0xe4, 0x1c, 0xdd, 0x23, 0x3b, 0x67, 0x9a, 0x30, 0x38, 0xe0, 0x55, 0xed, 0x88, 0xb2, 0x19, 0x9f, 0x0f, 0x64, 0x9a,
0xb5, 0x4f, 0x03, 0x72, 0x1e, 0x11, 0x65, 0x23, 0x91, 0x33, 0x4d, 0x78, 0xc1, 0xe0, 0x5d, 0xed, 0x1c, 0xbc, 0x0d, 0xd3, 0xb7, 0xd9, 0x9b, 0xe6, 0x98, 0x7d, 0xb7, 0x7f, 0x50, 0xfe, 0x10, 0xaa,
0x98, 0xb6, 0x19, 0x7f, 0xa8, 0xc8, 0xf4, 0x84, 0xf1, 0x16, 0x4c, 0xdf, 0x66, 0x97, 0xab, 0x63, 0x2f, 0x08, 0x56, 0xd3, 0xfc, 0x9b, 0x20, 0x9f, 0x5a, 0xbc, 0xd3, 0x8e, 0x6a, 0xe5, 0x69, 0xee,
0xe2, 0x6e, 0x7f, 0xa1, 0xfc, 0x46, 0x56, 0x5f, 0x10, 0xaa, 0xa6, 0xf9, 0x37, 0x41, 0xbe, 0xb4, 0xb4, 0xa3, 0x72, 0xa6, 0xf8, 0xe7, 0x9f, 0xe5, 0x4e, 0x3b, 0xd1, 0xde, 0xc7, 0xdf, 0x69, 0x7b,
0x38, 0xd2, 0x8e, 0x7a, 0xe5, 0x69, 0x46, 0xda, 0x51, 0x3b, 0x53, 0xe2, 0xf3, 0x4f, 0x32, 0xd2, 0x37, 0x2f, 0xef, 0x2f, 0xe9, 0x1a, 0x2d, 0xff, 0x86, 0x1e, 0xdc, 0xbc, 0x6e, 0xf8, 0x1b, 0x28,
0x4e, 0xdc, 0xef, 0x93, 0x47, 0xda, 0xde, 0xc9, 0xcb, 0xfb, 0x4b, 0xba, 0x46, 0xcb, 0x3f, 0xa1, 0x84, 0xd1, 0x3e, 0x56, 0xa0, 0x24, 0x9b, 0x73, 0xa2, 0x46, 0xef, 0x81, 0x02, 0x4b, 0xae, 0x44,
0x07, 0x27, 0xaf, 0x1b, 0xfe, 0x04, 0x0a, 0x69, 0xb4, 0x0f, 0x15, 0x28, 0xc9, 0xdb, 0x39, 0x11, 0x26, 0x3a, 0xc0, 0x3b, 0x9f, 0xc5, 0x9d, 0xf8, 0xf8, 0xee, 0x39, 0xc1, 0x70, 0x29, 0x61, 0x13,
0xd0, 0x7b, 0xa0, 0xc0, 0xb2, 0x2b, 0x89, 0x89, 0xbe, 0x24, 0x5e, 0xc8, 0x12, 0x4e, 0xfc, 0x1d, 0x25, 0xb1, 0xd2, 0x7e, 0xa8, 0x40, 0x12, 0xb0, 0x6a, 0xa7, 0x4c, 0x5f, 0x37, 0xb3, 0x3c, 0x1d,
0xf1, 0x19, 0xa1, 0x70, 0x39, 0x61, 0x12, 0x25, 0xa9, 0xd2, 0x7e, 0xa0, 0x40, 0x12, 0xb1, 0x6a, 0x0b, 0x4f, 0x1f, 0x67, 0xe6, 0xfa, 0xcf, 0x88, 0x46, 0xf9, 0xc0, 0x7a, 0x22, 0x8d, 0xd6, 0xa0,
0xa7, 0xdc, 0xfe, 0x6e, 0x65, 0xb9, 0xfd, 0x15, 0x91, 0x3e, 0xce, 0xd5, 0xef, 0x3f, 0x23, 0x1e, 0xc0, 0xc2, 0x22, 0xe6, 0x0d, 0x5b, 0x06, 0x35, 0x10, 0xdb, 0x51, 0x5d, 0x28, 0x85, 0x05, 0xc0,
0xe5, 0x2f, 0xe7, 0x13, 0x79, 0xb4, 0x06, 0x05, 0x96, 0x16, 0xb1, 0x68, 0xd8, 0x36, 0xa8, 0x81, 0x5b, 0x67, 0x05, 0xe3, 0xc8, 0x27, 0xdf, 0xb0, 0x94, 0xc4, 0xe6, 0xef, 0xec, 0x70, 0x4d, 0x89,
0xd8, 0x8c, 0xea, 0x42, 0x29, 0x6c, 0x00, 0xde, 0x38, 0x6b, 0x18, 0xc7, 0x5e, 0xf9, 0x86, 0xad, 0x22, 0x8a, 0x71, 0xd0, 0x3e, 0x50, 0xc2, 0x36, 0x81, 0xab, 0xf7, 0x6e, 0x8a, 0x7a, 0x33, 0x8d,
0x24, 0xf6, 0x43, 0x00, 0xb6, 0xb8, 0xa6, 0x24, 0x11, 0xc5, 0x34, 0x68, 0x3f, 0xc9, 0xc1, 0x42, 0x27, 0x82, 0x1f, 0x63, 0x69, 0xf8, 0x27, 0x39, 0x58, 0x88, 0xcd, 0x2e, 0x13, 0x27, 0xae, 0xca,
0xec, 0xfd, 0x32, 0xf1, 0xd5, 0x55, 0x79, 0xd2, 0xaf, 0xae, 0xdf, 0x57, 0x60, 0xc5, 0x95, 0x0d, 0x93, 0x9e, 0xb8, 0xfe, 0x40, 0x81, 0x65, 0x57, 0x16, 0x24, 0xea, 0xf6, 0x9b, 0x99, 0xc6, 0xaf,
0x89, 0x46, 0xdc, 0x56, 0xa6, 0x27, 0x58, 0x1e, 0x72, 0xeb, 0x42, 0xfd, 0x4a, 0xd2, 0x2c, 0x4a, 0xdc, 0xef, 0xd7, 0x04, 0xfb, 0xe5, 0xa4, 0x5d, 0x94, 0xc8, 0x4d, 0xfb, 0x91, 0x02, 0x89, 0xe0,
0xd4, 0xa6, 0xfd, 0x48, 0x81, 0x44, 0x72, 0xd5, 0x49, 0x89, 0xba, 0x8b, 0xd9, 0xde, 0x1c, 0xf8, 0xaa, 0x93, 0x62, 0x9b, 0x0b, 0xd9, 0x6c, 0xc3, 0xa7, 0xc3, 0xe3, 0x58, 0xe6, 0x4f, 0x91, 0xc7,
0x0b, 0xf1, 0x38, 0x61, 0xf7, 0x97, 0xc8, 0xbd, 0x29, 0x7f, 0x33, 0x79, 0xf2, 0x6d, 0x72, 0x13, 0x5b, 0x3e, 0x2f, 0x79, 0xf2, 0xb5, 0x7a, 0x03, 0x8a, 0xb6, 0x63, 0xe2, 0x48, 0x0f, 0x19, 0x24,
0x8a, 0xb6, 0x63, 0xe2, 0x08, 0x7c, 0x0b, 0xea, 0xdb, 0x0d, 0x31, 0x8e, 0x02, 0x8a, 0x58, 0x16, 0xd9, 0x1b, 0x62, 0x1d, 0x05, 0x10, 0xb1, 0x50, 0xcc, 0x8f, 0x15, 0x8a, 0x07, 0x30, 0xef, 0x46,
0xe4, 0xc7, 0xca, 0x82, 0x7b, 0xb0, 0x64, 0xc7, 0xdf, 0x73, 0x04, 0xf2, 0x3a, 0x06, 0xf6, 0x0e, 0x7d, 0x5e, 0xb4, 0x7e, 0x63, 0x76, 0x39, 0xdc, 0xae, 0x2b, 0x82, 0x87, 0x1c, 0x3d, 0x48, 0x26,
0x3d, 0x03, 0x85, 0x27, 0xfa, 0xa1, 0x29, 0x34, 0xac, 0x44, 0x82, 0x51, 0xcc, 0x9f, 0x4f, 0x2d, 0x2c, 0xf5, 0x6e, 0x4c, 0x7f, 0x4f, 0x6d, 0xef, 0xc6, 0x27, 0xad, 0xc9, 0xb5, 0xf1, 0x0f, 0x79,
0x8c, 0xe2, 0xaf, 0xaf, 0xc9, 0x6d, 0xea, 0x0f, 0x79, 0x28, 0xa7, 0x25, 0xbc, 0xfa, 0x3d, 0x05, 0x28, 0xa7, 0x65, 0x19, 0xf5, 0x03, 0x05, 0x56, 0x78, 0x20, 0xc5, 0xca, 0xe6, 0x64, 0xe1, 0x1a,
0x56, 0x79, 0x62, 0xc5, 0x3a, 0xd8, 0x64, 0xe9, 0x1b, 0x1c, 0x7c, 0xf7, 0x92, 0x64, 0xa2, 0x64, 0xdc, 0xb6, 0x77, 0x93, 0x68, 0xa2, 0x64, 0x56, 0xb2, 0x10, 0xd1, 0xa7, 0x97, 0xc9, 0xfe, 0x4b,
0x55, 0xb2, 0x11, 0xd1, 0x5b, 0x90, 0xc9, 0x7e, 0xb9, 0x31, 0x6c, 0x84, 0x74, 0xb3, 0x92, 0xac, 0x63, 0x58, 0x08, 0xe9, 0x39, 0x27, 0x99, 0x95, 0xe4, 0xb8, 0x85, 0x23, 0x1d, 0xf7, 0xbb, 0x30,
0x4a, 0x0a, 0xe4, 0xc2, 0xb1, 0x81, 0xfc, 0x6d, 0x98, 0x76, 0xd9, 0xdd, 0x84, 0x07, 0xd1, 0xc7, 0xed, 0xb2, 0x07, 0x11, 0xef, 0x5e, 0x30, 0xc6, 0xe8, 0x33, 0xf9, 0xdf, 0x7e, 0xc2, 0x5e, 0x8d,
0x78, 0x0e, 0x4d, 0xfe, 0x29, 0x50, 0x08, 0x9b, 0xf8, 0x37, 0x41, 0xbe, 0x54, 0xed, 0x77, 0x0a, 0x7f, 0x13, 0xe4, 0x53, 0xd5, 0x7e, 0xa7, 0xc0, 0x50, 0xce, 0x9b, 0xa8, 0x72, 0x19, 0x00, 0xdd,
0x0c, 0xd5, 0xc0, 0x89, 0x9a, 0x88, 0x01, 0xd0, 0xfd, 0x3f, 0x1d, 0x1a, 0xa8, 0x88, 0x78, 0x31, 0xff, 0x53, 0xa1, 0x01, 0x8b, 0x88, 0x16, 0x23, 0x44, 0x75, 0xfd, 0xe1, 0xe3, 0xca, 0xd4, 0xa3,
0x22, 0x54, 0xd7, 0x1f, 0x3e, 0xae, 0x4c, 0x3d, 0x7a, 0x5c, 0x99, 0xfa, 0xe8, 0x71, 0x65, 0xea, 0xc7, 0x95, 0xa9, 0x4f, 0x1e, 0x57, 0xa6, 0x1e, 0x0c, 0x2a, 0xca, 0xc3, 0x41, 0x45, 0x79, 0x34,
0xc1, 0xa0, 0xa2, 0x3c, 0x1c, 0x54, 0x94, 0x47, 0x83, 0x8a, 0xf2, 0xd1, 0xa0, 0xa2, 0xfc, 0x6b, 0xa8, 0x28, 0x9f, 0x0c, 0x2a, 0xca, 0xbf, 0x06, 0x15, 0xe5, 0xc3, 0x7f, 0x57, 0xa6, 0xde, 0x5d,
0x50, 0x51, 0xde, 0xff, 0x77, 0x65, 0xea, 0x9d, 0xf5, 0x51, 0x3f, 0x1a, 0xfc, 0x5f, 0x00, 0x00, 0x1b, 0xf5, 0x0f, 0x82, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x94, 0xb7, 0xe5, 0x3f, 0x28,
0x00, 0xff, 0xff, 0x2a, 0x22, 0x93, 0x1b, 0x53, 0x28, 0x00, 0x00, 0x00, 0x00,
} }
func (m *AllocationResult) Marshal() (dAtA []byte, err error) { func (m *AllocationResult) Marshal() (dAtA []byte, err error) {
@@ -2013,41 +2013,6 @@ func (m *NamedResourcesStringSlice) MarshalToSizedBuffer(dAtA []byte) (int, erro
return len(dAtA) - i, nil return len(dAtA) - i, nil
} }
func (m *NodeResourceModel) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
return dAtA[:n], nil
}
func (m *NodeResourceModel) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
func (m *NodeResourceModel) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
_ = l
if m.NamedResources != nil {
{
size, err := m.NamedResources.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintGenerated(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
}
return len(dAtA) - i, nil
}
func (m *PodSchedulingContext) Marshal() (dAtA []byte, err error) { func (m *PodSchedulingContext) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
dAtA = make([]byte, size) dAtA = make([]byte, size)
@@ -3194,6 +3159,41 @@ func (m *ResourceHandle) MarshalToSizedBuffer(dAtA []byte) (int, error) {
return len(dAtA) - i, nil return len(dAtA) - i, nil
} }
func (m *ResourceModel) Marshal() (dAtA []byte, err error) {
size := m.Size()
dAtA = make([]byte, size)
n, err := m.MarshalToSizedBuffer(dAtA[:size])
if err != nil {
return nil, err
}
return dAtA[:n], nil
}
func (m *ResourceModel) MarshalTo(dAtA []byte) (int, error) {
size := m.Size()
return m.MarshalToSizedBuffer(dAtA[:size])
}
func (m *ResourceModel) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i := len(dAtA)
_ = i
var l int
_ = l
if m.NamedResources != nil {
{
size, err := m.NamedResources.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
i -= size
i = encodeVarintGenerated(dAtA, i, uint64(size))
}
i--
dAtA[i] = 0xa
}
return len(dAtA) - i, nil
}
func (m *ResourceRequest) Marshal() (dAtA []byte, err error) { func (m *ResourceRequest) Marshal() (dAtA []byte, err error) {
size := m.Size() size := m.Size()
dAtA = make([]byte, size) dAtA = make([]byte, size)
@@ -3293,7 +3293,7 @@ func (m *ResourceSlice) MarshalToSizedBuffer(dAtA []byte) (int, error) {
var l int var l int
_ = l _ = l
{ {
size, err := m.NodeResourceModel.MarshalToSizedBuffer(dAtA[:i]) size, err := m.ResourceModel.MarshalToSizedBuffer(dAtA[:i])
if err != nil { if err != nil {
return 0, err return 0, err
} }
@@ -3690,19 +3690,6 @@ func (m *NamedResourcesStringSlice) Size() (n int) {
return n return n
} }
func (m *NodeResourceModel) Size() (n int) {
if m == nil {
return 0
}
var l int
_ = l
if m.NamedResources != nil {
l = m.NamedResources.Size()
n += 1 + l + sovGenerated(uint64(l))
}
return n
}
func (m *PodSchedulingContext) Size() (n int) { func (m *PodSchedulingContext) Size() (n int) {
if m == nil { if m == nil {
return 0 return 0
@@ -4114,6 +4101,19 @@ func (m *ResourceHandle) Size() (n int) {
return n return n
} }
func (m *ResourceModel) Size() (n int) {
if m == nil {
return 0
}
var l int
_ = l
if m.NamedResources != nil {
l = m.NamedResources.Size()
n += 1 + l + sovGenerated(uint64(l))
}
return n
}
func (m *ResourceRequest) Size() (n int) { func (m *ResourceRequest) Size() (n int) {
if m == nil { if m == nil {
return 0 return 0
@@ -4152,7 +4152,7 @@ func (m *ResourceSlice) Size() (n int) {
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = len(m.DriverName) l = len(m.DriverName)
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
l = m.NodeResourceModel.Size() l = m.ResourceModel.Size()
n += 1 + l + sovGenerated(uint64(l)) n += 1 + l + sovGenerated(uint64(l))
return n return n
} }
@@ -4377,16 +4377,6 @@ func (this *NamedResourcesStringSlice) String() string {
}, "") }, "")
return s return s
} }
func (this *NodeResourceModel) String() string {
if this == nil {
return "nil"
}
s := strings.Join([]string{`&NodeResourceModel{`,
`NamedResources:` + strings.Replace(this.NamedResources.String(), "NamedResourcesResources", "NamedResourcesResources", 1) + `,`,
`}`,
}, "")
return s
}
func (this *PodSchedulingContext) String() string { func (this *PodSchedulingContext) String() string {
if this == nil { if this == nil {
return "nil" return "nil"
@@ -4722,6 +4712,16 @@ func (this *ResourceHandle) String() string {
}, "") }, "")
return s return s
} }
func (this *ResourceModel) String() string {
if this == nil {
return "nil"
}
s := strings.Join([]string{`&ResourceModel{`,
`NamedResources:` + strings.Replace(this.NamedResources.String(), "NamedResourcesResources", "NamedResourcesResources", 1) + `,`,
`}`,
}, "")
return s
}
func (this *ResourceRequest) String() string { func (this *ResourceRequest) String() string {
if this == nil { if this == nil {
return "nil" return "nil"
@@ -4751,7 +4751,7 @@ func (this *ResourceSlice) String() string {
`ObjectMeta:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ObjectMeta), "ObjectMeta", "v11.ObjectMeta", 1), `&`, ``, 1) + `,`, `ObjectMeta:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ObjectMeta), "ObjectMeta", "v11.ObjectMeta", 1), `&`, ``, 1) + `,`,
`NodeName:` + fmt.Sprintf("%v", this.NodeName) + `,`, `NodeName:` + fmt.Sprintf("%v", this.NodeName) + `,`,
`DriverName:` + fmt.Sprintf("%v", this.DriverName) + `,`, `DriverName:` + fmt.Sprintf("%v", this.DriverName) + `,`,
`NodeResourceModel:` + strings.Replace(strings.Replace(this.NodeResourceModel.String(), "NodeResourceModel", "NodeResourceModel", 1), `&`, ``, 1) + `,`, `ResourceModel:` + strings.Replace(strings.Replace(this.ResourceModel.String(), "ResourceModel", "ResourceModel", 1), `&`, ``, 1) + `,`,
`}`, `}`,
}, "") }, "")
return s return s
@@ -6334,92 +6334,6 @@ func (m *NamedResourcesStringSlice) Unmarshal(dAtA []byte) error {
} }
return nil return nil
} }
func (m *NodeResourceModel) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
preIndex := iNdEx
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
wire |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
return fmt.Errorf("proto: NodeResourceModel: wiretype end group for non-group")
}
if fieldNum <= 0 {
return fmt.Errorf("proto: NodeResourceModel: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field NamedResources", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
msglen |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthGenerated
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
if m.NamedResources == nil {
m.NamedResources = &NamedResourcesResources{}
}
if err := m.NamedResources.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipGenerated(dAtA[iNdEx:])
if err != nil {
return err
}
if (skippy < 0) || (iNdEx+skippy) < 0 {
return ErrInvalidLengthGenerated
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
}
iNdEx += skippy
}
}
if iNdEx > l {
return io.ErrUnexpectedEOF
}
return nil
}
func (m *PodSchedulingContext) Unmarshal(dAtA []byte) error { func (m *PodSchedulingContext) Unmarshal(dAtA []byte) error {
l := len(dAtA) l := len(dAtA)
iNdEx := 0 iNdEx := 0
@@ -9707,6 +9621,92 @@ func (m *ResourceHandle) Unmarshal(dAtA []byte) error {
} }
return nil return nil
} }
func (m *ResourceModel) Unmarshal(dAtA []byte) error {
l := len(dAtA)
iNdEx := 0
for iNdEx < l {
preIndex := iNdEx
var wire uint64
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
wire |= uint64(b&0x7F) << shift
if b < 0x80 {
break
}
}
fieldNum := int32(wire >> 3)
wireType := int(wire & 0x7)
if wireType == 4 {
return fmt.Errorf("proto: ResourceModel: wiretype end group for non-group")
}
if fieldNum <= 0 {
return fmt.Errorf("proto: ResourceModel: illegal tag %d (wire type %d)", fieldNum, wire)
}
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field NamedResources", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowGenerated
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
msglen |= int(b&0x7F) << shift
if b < 0x80 {
break
}
}
if msglen < 0 {
return ErrInvalidLengthGenerated
}
postIndex := iNdEx + msglen
if postIndex < 0 {
return ErrInvalidLengthGenerated
}
if postIndex > l {
return io.ErrUnexpectedEOF
}
if m.NamedResources == nil {
m.NamedResources = &NamedResourcesResources{}
}
if err := m.NamedResources.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
default:
iNdEx = preIndex
skippy, err := skipGenerated(dAtA[iNdEx:])
if err != nil {
return err
}
if (skippy < 0) || (iNdEx+skippy) < 0 {
return ErrInvalidLengthGenerated
}
if (iNdEx + skippy) > l {
return io.ErrUnexpectedEOF
}
iNdEx += skippy
}
}
if iNdEx > l {
return io.ErrUnexpectedEOF
}
return nil
}
func (m *ResourceRequest) Unmarshal(dAtA []byte) error { func (m *ResourceRequest) Unmarshal(dAtA []byte) error {
l := len(dAtA) l := len(dAtA)
iNdEx := 0 iNdEx := 0
@@ -10037,7 +10037,7 @@ func (m *ResourceSlice) Unmarshal(dAtA []byte) error {
iNdEx = postIndex iNdEx = postIndex
case 4: case 4:
if wireType != 2 { if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field NodeResourceModel", wireType) return fmt.Errorf("proto: wrong wireType = %d for field ResourceModel", wireType)
} }
var msglen int var msglen int
for shift := uint(0); ; shift += 7 { for shift := uint(0); ; shift += 7 {
@@ -10064,7 +10064,7 @@ func (m *ResourceSlice) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
if err := m.NodeResourceModel.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.ResourceModel.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }
iNdEx = postIndex iNdEx = postIndex

20
staging/src/k8s.io/api/resource/v1alpha2/generated.proto
View File

@@ -192,7 +192,7 @@ message NamedResourcesRequest {
optional string selector = 1; optional string selector = 1;
} }
// NamedResourcesResources is used in NodeResourceModel. // NamedResourcesResources is used in ResourceModel.
message NamedResourcesResources { message NamedResourcesResources {
// The list of all individual resources instances currently available. // The list of all individual resources instances currently available.
// //
@@ -208,14 +208,6 @@ message NamedResourcesStringSlice {
repeated string strings = 1; repeated string strings = 1;
} }
// NodeResourceModel must have one and only one field set.
message NodeResourceModel {
// NamedResources describes available resources using the named resources model.
//
// +optional
optional NamedResourcesResources namedResources = 1;
}
// PodSchedulingContext objects hold information that is needed to schedule // PodSchedulingContext objects hold information that is needed to schedule
// a Pod with ResourceClaims that use "WaitForFirstConsumer" allocation // a Pod with ResourceClaims that use "WaitForFirstConsumer" allocation
// mode. // mode.
@@ -655,6 +647,14 @@ message ResourceHandle {
optional StructuredResourceHandle structuredData = 5; optional StructuredResourceHandle structuredData = 5;
} }
// ResourceModel must have one and only one field set.
message ResourceModel {
// NamedResources describes available resources using the named resources model.
//
// +optional
optional NamedResourcesResources namedResources = 1;
}
// ResourceRequest is a request for resources from one particular driver. // ResourceRequest is a request for resources from one particular driver.
message ResourceRequest { message ResourceRequest {
// VendorParameters are arbitrary setup parameters for the requested // VendorParameters are arbitrary setup parameters for the requested
@@ -695,7 +695,7 @@ message ResourceSlice {
// objects with a certain driver name. // objects with a certain driver name.
optional string driverName = 3; optional string driverName = 3;
optional NodeResourceModel nodeResourceModel = 4; optional ResourceModel resourceModel = 4;
} }
// ResourceSliceList is a collection of ResourceSlices. // ResourceSliceList is a collection of ResourceSlices.

2
staging/src/k8s.io/api/resource/v1alpha2/namedresources.go
View File

@@ -20,7 +20,7 @@ import (
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
) )
// NamedResourcesResources is used in NodeResourceModel. // NamedResourcesResources is used in ResourceModel.
type NamedResourcesResources struct { type NamedResourcesResources struct {
// The list of all individual resources instances currently available. // The list of all individual resources instances currently available.
// //

6
staging/src/k8s.io/api/resource/v1alpha2/types.go
View File

@@ -554,11 +554,11 @@ type ResourceSlice struct {
// objects with a certain driver name. // objects with a certain driver name.
DriverName string `json:"driverName" protobuf:"bytes,3,name=driverName"` DriverName string `json:"driverName" protobuf:"bytes,3,name=driverName"`
NodeResourceModel `json:",inline" protobuf:"bytes,4,name=nodeResourceModel"` ResourceModel `json:",inline" protobuf:"bytes,4,name=resourceModel"`
} }
// NodeResourceModel must have one and only one field set. // ResourceModel must have one and only one field set.
type NodeResourceModel struct { type ResourceModel struct {
// NamedResources describes available resources using the named resources model. // NamedResources describes available resources using the named resources model.
// //
// +optional // +optional

18
staging/src/k8s.io/api/resource/v1alpha2/types_swagger_doc_generated.go generated
View File

@@ -67,15 +67,6 @@ func (DriverRequests) SwaggerDoc() map[string]string {
return map_DriverRequests return map_DriverRequests
} }
var map_NodeResourceModel = map[string]string{
"": "NodeResourceModel must have one and only one field set.",
"namedResources": "NamedResources describes available resources using the named resources model.",
}
func (NodeResourceModel) SwaggerDoc() map[string]string {
return map_NodeResourceModel
}
var map_PodSchedulingContext = map[string]string{ var map_PodSchedulingContext = map[string]string{
"": "PodSchedulingContext objects hold information that is needed to schedule a Pod with ResourceClaims that use \"WaitForFirstConsumer\" allocation mode.\n\nThis is an alpha type and requires enabling the DynamicResourceAllocation feature gate.", "": "PodSchedulingContext objects hold information that is needed to schedule a Pod with ResourceClaims that use \"WaitForFirstConsumer\" allocation mode.\n\nThis is an alpha type and requires enabling the DynamicResourceAllocation feature gate.",
"metadata": "Standard object metadata", "metadata": "Standard object metadata",
@@ -331,6 +322,15 @@ func (ResourceHandle) SwaggerDoc() map[string]string {
return map_ResourceHandle return map_ResourceHandle
} }
var map_ResourceModel = map[string]string{
"": "ResourceModel must have one and only one field set.",
"namedResources": "NamedResources describes available resources using the named resources model.",
}
func (ResourceModel) SwaggerDoc() map[string]string {
return map_ResourceModel
}
var map_ResourceRequest = map[string]string{ var map_ResourceRequest = map[string]string{
"": "ResourceRequest is a request for resources from one particular driver.", "": "ResourceRequest is a request for resources from one particular driver.",
"vendorParameters": "VendorParameters are arbitrary setup parameters for the requested resource. They are ignored while allocating a claim.", "vendorParameters": "VendorParameters are arbitrary setup parameters for the requested resource. They are ignored while allocating a claim.",

44
staging/src/k8s.io/api/resource/v1alpha2/zz_generated.deepcopy.go generated
View File

@@ -321,27 +321,6 @@ func (in *NamedResourcesStringSlice) DeepCopy() *NamedResourcesStringSlice {
return out return out
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *NodeResourceModel) DeepCopyInto(out *NodeResourceModel) {
*out = *in
if in.NamedResources != nil {
in, out := &in.NamedResources, &out.NamedResources
*out = new(NamedResourcesResources)
(*in).DeepCopyInto(*out)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NodeResourceModel.
func (in *NodeResourceModel) DeepCopy() *NodeResourceModel {
if in == nil {
return nil
}
out := new(NodeResourceModel)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *PodSchedulingContext) DeepCopyInto(out *PodSchedulingContext) { func (in *PodSchedulingContext) DeepCopyInto(out *PodSchedulingContext) {
*out = *in *out = *in
@@ -984,6 +963,27 @@ func (in *ResourceHandle) DeepCopy() *ResourceHandle {
return out return out
} }
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ResourceModel) DeepCopyInto(out *ResourceModel) {
*out = *in
if in.NamedResources != nil {
in, out := &in.NamedResources, &out.NamedResources
*out = new(NamedResourcesResources)
(*in).DeepCopyInto(*out)
}
return
}
// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ResourceModel.
func (in *ResourceModel) DeepCopy() *ResourceModel {
if in == nil {
return nil
}
out := new(ResourceModel)
in.DeepCopyInto(out)
return out
}
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
func (in *ResourceRequest) DeepCopyInto(out *ResourceRequest) { func (in *ResourceRequest) DeepCopyInto(out *ResourceRequest) {
*out = *in *out = *in
@@ -1028,7 +1028,7 @@ func (in *ResourceSlice) DeepCopyInto(out *ResourceSlice) {
*out = *in *out = *in
out.TypeMeta = in.TypeMeta out.TypeMeta = in.TypeMeta
in.ObjectMeta.DeepCopyInto(&out.ObjectMeta) in.ObjectMeta.DeepCopyInto(&out.ObjectMeta)
in.NodeResourceModel.DeepCopyInto(&out.NodeResourceModel) in.ResourceModel.DeepCopyInto(&out.ResourceModel)
return return
} }

12
staging/src/k8s.io/client-go/applyconfigurations/resource/v1alpha2/noderesourcemodel.go → staging/src/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourcemodel.go
View File

@@ -18,22 +18,22 @@ limitations under the License.
package v1alpha2 package v1alpha2
// NodeResourceModelApplyConfiguration represents an declarative configuration of the NodeResourceModel type for use // ResourceModelApplyConfiguration represents an declarative configuration of the ResourceModel type for use
// with apply. // with apply.
type NodeResourceModelApplyConfiguration struct { type ResourceModelApplyConfiguration struct {
NamedResources *NamedResourcesResourcesApplyConfiguration `json:"namedResources,omitempty"` NamedResources *NamedResourcesResourcesApplyConfiguration `json:"namedResources,omitempty"`
} }
// NodeResourceModelApplyConfiguration constructs an declarative configuration of the NodeResourceModel type for use with // ResourceModelApplyConfiguration constructs an declarative configuration of the ResourceModel type for use with
// apply. // apply.
func NodeResourceModel() *NodeResourceModelApplyConfiguration { func ResourceModel() *ResourceModelApplyConfiguration {
return &NodeResourceModelApplyConfiguration{} return &ResourceModelApplyConfiguration{}
} }
// WithNamedResources sets the NamedResources field in the declarative configuration to the given value // WithNamedResources sets the NamedResources field in the declarative configuration to the given value
// and returns the receiver, so that objects can be built by chaining "With" function invocations. // and returns the receiver, so that objects can be built by chaining "With" function invocations.
// If called multiple times, the NamedResources field is set to the value of the last call. // If called multiple times, the NamedResources field is set to the value of the last call.
func (b *NodeResourceModelApplyConfiguration) WithNamedResources(value *NamedResourcesResourcesApplyConfiguration) *NodeResourceModelApplyConfiguration { func (b *ResourceModelApplyConfiguration) WithNamedResources(value *NamedResourcesResourcesApplyConfiguration) *ResourceModelApplyConfiguration {
b.NamedResources = value b.NamedResources = value
return b return b
} }

2
staging/src/k8s.io/client-go/applyconfigurations/resource/v1alpha2/resourceslice.go
View File

@@ -34,7 +34,7 @@ type ResourceSliceApplyConfiguration struct {
*v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"`
NodeName *string `json:"nodeName,omitempty"` NodeName *string `json:"nodeName,omitempty"`
DriverName *string `json:"driverName,omitempty"` DriverName *string `json:"driverName,omitempty"`
NodeResourceModelApplyConfiguration `json:",inline"` ResourceModelApplyConfiguration `json:",inline"`
} }
// ResourceSlice constructs an declarative configuration of the ResourceSlice type for use with // ResourceSlice constructs an declarative configuration of the ResourceSlice type for use with

4
staging/src/k8s.io/client-go/applyconfigurations/utils.go
View File

@@ -1559,8 +1559,6 @@ func ForKind(kind schema.GroupVersionKind) interface{} {
return &resourcev1alpha2.NamedResourcesResourcesApplyConfiguration{} return &resourcev1alpha2.NamedResourcesResourcesApplyConfiguration{}
case v1alpha2.SchemeGroupVersion.WithKind("NamedResourcesStringSlice"): case v1alpha2.SchemeGroupVersion.WithKind("NamedResourcesStringSlice"):
return &resourcev1alpha2.NamedResourcesStringSliceApplyConfiguration{} return &resourcev1alpha2.NamedResourcesStringSliceApplyConfiguration{}
case v1alpha2.SchemeGroupVersion.WithKind("NodeResourceModel"):
return &resourcev1alpha2.NodeResourceModelApplyConfiguration{}
case v1alpha2.SchemeGroupVersion.WithKind("PodSchedulingContext"): case v1alpha2.SchemeGroupVersion.WithKind("PodSchedulingContext"):
return &resourcev1alpha2.PodSchedulingContextApplyConfiguration{} return &resourcev1alpha2.PodSchedulingContextApplyConfiguration{}
case v1alpha2.SchemeGroupVersion.WithKind("PodSchedulingContextSpec"): case v1alpha2.SchemeGroupVersion.WithKind("PodSchedulingContextSpec"):
@@ -1597,6 +1595,8 @@ func ForKind(kind schema.GroupVersionKind) interface{} {
return &resourcev1alpha2.ResourceFilterModelApplyConfiguration{} return &resourcev1alpha2.ResourceFilterModelApplyConfiguration{}
case v1alpha2.SchemeGroupVersion.WithKind("ResourceHandle"): case v1alpha2.SchemeGroupVersion.WithKind("ResourceHandle"):
return &resourcev1alpha2.ResourceHandleApplyConfiguration{} return &resourcev1alpha2.ResourceHandleApplyConfiguration{}
case v1alpha2.SchemeGroupVersion.WithKind("ResourceModel"):
return &resourcev1alpha2.ResourceModelApplyConfiguration{}
case v1alpha2.SchemeGroupVersion.WithKind("ResourceRequest"): case v1alpha2.SchemeGroupVersion.WithKind("ResourceRequest"):
return &resourcev1alpha2.ResourceRequestApplyConfiguration{} return &resourcev1alpha2.ResourceRequestApplyConfiguration{}
case v1alpha2.SchemeGroupVersion.WithKind("ResourceRequestModel"): case v1alpha2.SchemeGroupVersion.WithKind("ResourceRequestModel"):

90
staging/src/k8s.io/kubelet/pkg/apis/dra/v1alpha3/api.pb.go
View File

@@ -380,7 +380,7 @@ func (m *NodeListAndWatchResourcesRequest) XXX_DiscardUnknown() {
var xxx_messageInfo_NodeListAndWatchResourcesRequest proto.InternalMessageInfo var xxx_messageInfo_NodeListAndWatchResourcesRequest proto.InternalMessageInfo
type NodeListAndWatchResourcesResponse struct { type NodeListAndWatchResourcesResponse struct {
Resources []*v1alpha2.NodeResourceModel `protobuf:"bytes,1,rep,name=resources,proto3" json:"resources,omitempty"` Resources []*v1alpha2.ResourceModel `protobuf:"bytes,1,rep,name=resources,proto3" json:"resources,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
} }
@@ -417,7 +417,7 @@ func (m *NodeListAndWatchResourcesResponse) XXX_DiscardUnknown() {
var xxx_messageInfo_NodeListAndWatchResourcesResponse proto.InternalMessageInfo var xxx_messageInfo_NodeListAndWatchResourcesResponse proto.InternalMessageInfo
func (m *NodeListAndWatchResourcesResponse) GetResources() []*v1alpha2.NodeResourceModel { func (m *NodeListAndWatchResourcesResponse) GetResources() []*v1alpha2.ResourceModel {
if m != nil { if m != nil {
return m.Resources return m.Resources
} }
@@ -532,46 +532,46 @@ func init() { proto.RegisterFile("api.proto", fileDescriptor_00212fb1f9d3bf1c) }
var fileDescriptor_00212fb1f9d3bf1c = []byte{ var fileDescriptor_00212fb1f9d3bf1c = []byte{
// 631 bytes of a gzipped FileDescriptorProto // 631 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcd, 0x6e, 0xd3, 0x40, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x55, 0xcf, 0x6e, 0xd3, 0x4c,
0x10, 0xce, 0xb6, 0x4d, 0x45, 0x26, 0x52, 0x8b, 0x56, 0x15, 0x0a, 0xa6, 0x98, 0x60, 0x51, 0x12, 0x10, 0xcf, 0xb6, 0x4d, 0xf5, 0x65, 0x22, 0xb5, 0x9f, 0x56, 0x15, 0x0a, 0xa6, 0x98, 0x60, 0x51,
0xf1, 0x63, 0x83, 0x0b, 0xa8, 0x02, 0x71, 0xa0, 0x2d, 0xa8, 0xa0, 0x16, 0x21, 0x23, 0x84, 0xc4, 0x12, 0x51, 0xb0, 0xc1, 0x05, 0x54, 0x81, 0x38, 0xd0, 0x16, 0xd4, 0xa2, 0x82, 0x90, 0x11, 0x42,
0xa5, 0x6c, 0xbc, 0x8b, 0x63, 0xc5, 0xb1, 0xcd, 0xae, 0x5d, 0xd1, 0x1b, 0x8f, 0xc0, 0x63, 0xf5, 0xe2, 0x52, 0x36, 0xde, 0xc5, 0xb1, 0xe2, 0xd8, 0x66, 0xd7, 0xae, 0xe8, 0x8d, 0x47, 0xe0, 0xb1,
0xc0, 0x01, 0x71, 0xea, 0x09, 0xd1, 0x70, 0xe3, 0x29, 0x90, 0xd7, 0xde, 0xb4, 0x89, 0x9c, 0xa4, 0x7a, 0xe0, 0x80, 0x38, 0xf5, 0x84, 0x68, 0xb8, 0xf1, 0x14, 0xc8, 0x6b, 0x6f, 0xda, 0x44, 0x4e,
0x12, 0xb7, 0xd9, 0xf9, 0xf9, 0x66, 0xe7, 0x9b, 0x99, 0x5d, 0xa8, 0x91, 0xd8, 0x37, 0x63, 0x1e, 0x52, 0x89, 0xdb, 0xec, 0xfc, 0xf9, 0xcd, 0xce, 0x6f, 0x66, 0x76, 0xa1, 0x46, 0x62, 0xdf, 0x8c,
0x25, 0x11, 0xbe, 0x70, 0x70, 0x9f, 0x04, 0x71, 0x97, 0xac, 0x6b, 0x77, 0x3d, 0x3f, 0xe9, 0xa6, 0x79, 0x94, 0x44, 0xf8, 0xbf, 0xc3, 0x7b, 0x24, 0x88, 0xbb, 0x64, 0x43, 0xbb, 0xe3, 0xf9, 0x49,
0x1d, 0xd3, 0x8d, 0xfa, 0x96, 0x17, 0x79, 0x91, 0x25, 0x1d, 0x3a, 0xe9, 0x27, 0x79, 0x92, 0x07, 0x37, 0xed, 0x98, 0x6e, 0xd4, 0xb7, 0xbc, 0xc8, 0x8b, 0x2c, 0xe9, 0xd0, 0x49, 0x3f, 0xca, 0x93,
0x29, 0xe5, 0x81, 0xda, 0x9d, 0xde, 0x86, 0x30, 0xfd, 0xc8, 0x22, 0xb1, 0x6f, 0x71, 0x26, 0xa2, 0x3c, 0x48, 0x29, 0x0f, 0xd4, 0x6e, 0xf7, 0x36, 0x85, 0xe9, 0x47, 0x16, 0x89, 0x7d, 0x8b, 0x33,
0x94, 0xbb, 0xcc, 0x2a, 0xc0, 0x6c, 0xcb, 0x63, 0x21, 0xe3, 0x24, 0x61, 0x34, 0xf7, 0x36, 0x5e, 0x11, 0xa5, 0xdc, 0x65, 0x56, 0x01, 0x66, 0x5b, 0x1e, 0x0b, 0x19, 0x27, 0x09, 0xa3, 0xb9, 0xb7,
0xc0, 0x95, 0xd7, 0x11, 0x65, 0x6f, 0x38, 0x8b, 0x09, 0x67, 0x4e, 0xe1, 0x2f, 0x1c, 0xf6, 0x39, 0xf1, 0x1c, 0xae, 0xbc, 0x8a, 0x28, 0x7b, 0xcd, 0x59, 0x4c, 0x38, 0x73, 0x0a, 0x7f, 0xe1, 0xb0,
0x65, 0x22, 0xc1, 0x2d, 0x58, 0x74, 0x03, 0xe2, 0xf7, 0x45, 0x03, 0x35, 0xe7, 0xdb, 0x75, 0x7b, 0x4f, 0x29, 0x13, 0x09, 0x6e, 0xc1, 0xa2, 0x1b, 0x10, 0xbf, 0x2f, 0x1a, 0xa8, 0x39, 0xdf, 0xae,
0xd9, 0x54, 0xd7, 0x32, 0xb7, 0x32, 0xbd, 0x53, 0x98, 0x8d, 0xef, 0x08, 0x56, 0xcb, 0x81, 0x44, 0xdb, 0xcb, 0xa6, 0xba, 0x96, 0xb9, 0x9d, 0xe9, 0x9d, 0xc2, 0x6c, 0x7c, 0x43, 0xb0, 0x5a, 0x0e,
0x1c, 0x85, 0x82, 0xe1, 0x57, 0x63, 0x48, 0xf6, 0x29, 0xd2, 0xb4, 0xb8, 0x3c, 0x8d, 0x78, 0x1e, 0x24, 0xe2, 0x28, 0x14, 0x0c, 0xbf, 0x18, 0x43, 0xb2, 0xcf, 0x90, 0xa6, 0xc5, 0xe5, 0x69, 0xc4,
0x26, 0xfc, 0x50, 0x25, 0xd3, 0x3e, 0x42, 0xfd, 0x8c, 0x1a, 0x5f, 0x84, 0xf9, 0x1e, 0x3b, 0x6c, 0xb3, 0x30, 0xe1, 0x47, 0x2a, 0x99, 0xf6, 0x01, 0xea, 0xe7, 0xd4, 0xf8, 0x7f, 0x98, 0xef, 0xb1,
0xa0, 0x26, 0x6a, 0xd7, 0x9c, 0x4c, 0xc4, 0x4f, 0xa0, 0x7a, 0x40, 0x82, 0x94, 0x35, 0xe6, 0x9a, 0xa3, 0x06, 0x6a, 0xa2, 0x76, 0xcd, 0xc9, 0x44, 0xfc, 0x18, 0xaa, 0x87, 0x24, 0x48, 0x59, 0x63,
0xa8, 0x5d, 0xb7, 0xd7, 0xa6, 0xe6, 0x52, 0xa9, 0x9c, 0x3c, 0xe6, 0xf1, 0xdc, 0x06, 0x32, 0x68, 0xae, 0x89, 0xda, 0x75, 0x7b, 0x6d, 0x6a, 0x2e, 0x95, 0xca, 0xc9, 0x63, 0x1e, 0xcd, 0x6d, 0x22,
0x29, 0x2d, 0xc3, 0x62, 0x2c, 0xa8, 0xbb, 0xd4, 0xdf, 0xa7, 0xec, 0xc0, 0x77, 0x59, 0x5e, 0x51, 0x83, 0x96, 0xd2, 0x32, 0x2c, 0xc6, 0x82, 0xba, 0x4b, 0xfd, 0x03, 0xca, 0x0e, 0x7d, 0x97, 0xe5,
0x6d, 0x73, 0x69, 0xf0, 0xeb, 0x1a, 0x6c, 0x6d, 0xbf, 0xdc, 0xce, 0xb5, 0x0e, 0xb8, 0xd4, 0x2f, 0x15, 0xd5, 0xb6, 0x96, 0x06, 0x3f, 0xaf, 0xc1, 0xf6, 0xce, 0xde, 0x4e, 0xae, 0x75, 0xc0, 0xa5,
0x64, 0xbc, 0x02, 0x55, 0xc6, 0x79, 0xc4, 0xe5, 0x85, 0x6a, 0x4e, 0x7e, 0x30, 0x76, 0xe0, 0x6a, 0x7e, 0x21, 0xe3, 0x15, 0xa8, 0x32, 0xce, 0x23, 0x2e, 0x2f, 0x54, 0x73, 0xf2, 0x83, 0xb1, 0x0b,
0x96, 0xe5, 0x5d, 0x18, 0xff, 0x2f, 0xfd, 0x3f, 0x11, 0xe8, 0x93, 0xa0, 0x8a, 0x3b, 0xef, 0x8e, 0x57, 0xb3, 0x2c, 0x6f, 0xc3, 0xf8, 0x5f, 0xe9, 0xff, 0x81, 0x40, 0x9f, 0x04, 0x55, 0xdc, 0x79,
0x61, 0x3d, 0x18, 0x25, 0x65, 0x72, 0x64, 0x69, 0x0b, 0x3a, 0xb3, 0x5a, 0xf0, 0x74, 0xb4, 0x05, 0x7f, 0x0c, 0xeb, 0xfe, 0x28, 0x29, 0x93, 0x23, 0x4b, 0x5b, 0xd0, 0x99, 0xd5, 0x82, 0x27, 0xa3,
0xad, 0x19, 0xd9, 0xca, 0x9a, 0xf0, 0x70, 0x02, 0x3d, 0xc3, 0x92, 0x86, 0xac, 0xa2, 0xb3, 0xac, 0x2d, 0x68, 0xcd, 0xc8, 0x56, 0xd6, 0x84, 0x07, 0x13, 0xe8, 0x19, 0x96, 0x34, 0x64, 0x15, 0x9d,
0x1a, 0xd0, 0xcc, 0xc2, 0x76, 0x7d, 0x91, 0x3c, 0x0b, 0xe9, 0x7b, 0x92, 0xb8, 0xdd, 0x71, 0x62, 0x67, 0xd5, 0x80, 0x66, 0x16, 0xb6, 0xef, 0x8b, 0xe4, 0x69, 0x48, 0xdf, 0x91, 0xc4, 0xed, 0x8e,
0x0d, 0x0e, 0xd7, 0xa7, 0xf8, 0x14, 0xf0, 0x7b, 0x50, 0x53, 0x0b, 0xa4, 0x48, 0xb3, 0xcc, 0x7c, 0x13, 0x6b, 0x84, 0x70, 0x7d, 0x8a, 0x4f, 0x01, 0xbf, 0x07, 0x35, 0xb5, 0x40, 0x8a, 0xb4, 0x75,
0xbb, 0xcc, 0x6c, 0x51, 0x95, 0x51, 0x95, 0x66, 0xcb, 0xd2, 0x14, 0xce, 0x5e, 0x44, 0x59, 0xe0, 0x33, 0xdf, 0x2e, 0x33, 0x5b, 0x54, 0x65, 0x54, 0xa5, 0xd9, 0xa6, 0xc2, 0x78, 0x19, 0x51, 0x16,
0x9c, 0x22, 0x18, 0x7f, 0x11, 0x54, 0x25, 0x67, 0x78, 0x15, 0x6a, 0x21, 0xe9, 0x33, 0x11, 0x13, 0x38, 0x67, 0xd1, 0xc6, 0x1f, 0x04, 0x55, 0xc9, 0x17, 0x5e, 0x85, 0x5a, 0x48, 0xfa, 0x4c, 0xc4,
0x97, 0x15, 0x77, 0x3f, 0x55, 0x64, 0x5c, 0xa6, 0x3e, 0x2d, 0x26, 0x25, 0x13, 0x31, 0x86, 0x85, 0xc4, 0x65, 0xc5, 0xbd, 0xcf, 0x14, 0x19, 0x8f, 0xa9, 0x4f, 0x8b, 0x29, 0xc9, 0x44, 0x8c, 0x61,
0xcc, 0xdc, 0x98, 0x97, 0x2a, 0x29, 0xe3, 0x16, 0x2c, 0x2b, 0xe8, 0xfd, 0x2e, 0x09, 0x69, 0xc0, 0x21, 0x33, 0x37, 0xe6, 0xa5, 0x4a, 0xca, 0xb8, 0x05, 0xcb, 0x0a, 0xfa, 0xa0, 0x4b, 0x42, 0x1a,
0x1a, 0x0b, 0xd2, 0xbc, 0xa4, 0xd4, 0x3b, 0x52, 0x8b, 0x13, 0xd0, 0x44, 0xc2, 0x53, 0x37, 0x49, 0xb0, 0xc6, 0x82, 0x34, 0x2f, 0x29, 0xf5, 0xae, 0xd4, 0xe2, 0x04, 0x34, 0x91, 0xf0, 0xd4, 0x4d,
0x39, 0xa3, 0xfb, 0xe3, 0x31, 0x55, 0x59, 0xd6, 0xa3, 0xe9, 0x65, 0xbd, 0x1d, 0xc6, 0x3b, 0x23, 0x52, 0xce, 0xe8, 0xc1, 0x78, 0x4c, 0x55, 0x96, 0xf4, 0x70, 0x7a, 0x49, 0x6f, 0x86, 0xf1, 0xce,
0xd8, 0x4e, 0x43, 0x4c, 0xb0, 0xd8, 0xc7, 0x73, 0xb0, 0x90, 0xb1, 0x81, 0x3d, 0x58, 0x29, 0xdb, 0x08, 0xb6, 0xd3, 0x10, 0x13, 0x2c, 0xf6, 0xc9, 0x1c, 0x2c, 0x64, 0xec, 0x62, 0x0f, 0x56, 0xca,
0x6f, 0xbc, 0x36, 0x6b, 0xff, 0x65, 0xa3, 0xb4, 0x9b, 0xe7, 0x7b, 0x26, 0x8c, 0x0a, 0xee, 0xc3, 0x76, 0x1b, 0xaf, 0xcd, 0xda, 0x7d, 0xd9, 0x24, 0xed, 0xe6, 0xc5, 0x9e, 0x08, 0xa3, 0x82, 0xfb,
0xa5, 0xf2, 0x39, 0xc6, 0xad, 0xd9, 0x93, 0x9e, 0x27, 0x6b, 0x9f, 0x77, 0x25, 0x8c, 0x0a, 0xfe, 0x70, 0xa9, 0x7c, 0x86, 0x71, 0x6b, 0xf6, 0x94, 0xe7, 0xc9, 0xda, 0x17, 0x5d, 0x07, 0xa3, 0x82,
0x02, 0x97, 0x27, 0x4e, 0x10, 0xbe, 0x35, 0x0a, 0x34, 0x6d, 0x14, 0xb5, 0xdb, 0xe7, 0xf2, 0x55, 0x3f, 0xc3, 0xe5, 0x89, 0xd3, 0x83, 0x6f, 0x8d, 0x02, 0x4d, 0x1b, 0x43, 0x6d, 0xfd, 0x42, 0xbe,
0x79, 0xef, 0xa1, 0xcd, 0xcd, 0xa3, 0x13, 0x1d, 0x1d, 0x9f, 0xe8, 0x95, 0xaf, 0x03, 0x1d, 0x1d, 0x2a, 0xef, 0x5d, 0xb4, 0xb5, 0x75, 0x7c, 0xaa, 0xa3, 0x93, 0x53, 0xbd, 0xf2, 0x65, 0xa0, 0xa3,
0x0d, 0x74, 0xf4, 0x63, 0xa0, 0xa3, 0xdf, 0x03, 0x1d, 0x7d, 0xfb, 0xa3, 0x57, 0x3e, 0xdc, 0x28, 0xe3, 0x81, 0x8e, 0xbe, 0x0f, 0x74, 0xf4, 0x6b, 0xa0, 0xa3, 0xaf, 0xbf, 0xf5, 0xca, 0xfb, 0x1b,
0x9e, 0xff, 0x5e, 0xda, 0x61, 0x01, 0x4b, 0xac, 0xb8, 0xe7, 0x65, 0x5f, 0x81, 0xb0, 0x28, 0x27, 0xc5, 0xd3, 0xdf, 0x4b, 0x3b, 0x2c, 0x60, 0x89, 0x15, 0xf7, 0xbc, 0xec, 0x1b, 0x10, 0x16, 0xe5,
0xea, 0x1b, 0x58, 0xef, 0x2c, 0xca, 0xd7, 0x7f, 0xfd, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x20, 0x44, 0x7d, 0x01, 0x1b, 0x9d, 0x45, 0xf9, 0xf2, 0x6f, 0xfc, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xb2,
0x6d, 0x9d, 0x90, 0x71, 0x06, 0x00, 0x00, 0x0b, 0x57, 0x0c, 0x6d, 0x06, 0x00, 0x00,
} }
// Reference imports to suppress errors if they are not otherwise used. // Reference imports to suppress errors if they are not otherwise used.
@@ -1420,9 +1420,9 @@ func (this *NodeListAndWatchResourcesResponse) String() string {
if this == nil { if this == nil {
return "nil" return "nil"
} }
repeatedStringForResources := "[]*NodeResourceModel{" repeatedStringForResources := "[]*ResourceModel{"
for _, f := range this.Resources { for _, f := range this.Resources {
repeatedStringForResources += strings.Replace(fmt.Sprintf("%v", f), "NodeResourceModel", "v1alpha2.NodeResourceModel", 1) + "," repeatedStringForResources += strings.Replace(fmt.Sprintf("%v", f), "ResourceModel", "v1alpha2.ResourceModel", 1) + ","
} }
repeatedStringForResources += "}" repeatedStringForResources += "}"
s := strings.Join([]string{`&NodeListAndWatchResourcesResponse{`, s := strings.Join([]string{`&NodeListAndWatchResourcesResponse{`,
@@ -2288,7 +2288,7 @@ func (m *NodeListAndWatchResourcesResponse) Unmarshal(dAtA []byte) error {
if postIndex > l { if postIndex > l {
return io.ErrUnexpectedEOF return io.ErrUnexpectedEOF
} }
m.Resources = append(m.Resources, &v1alpha2.NodeResourceModel{}) m.Resources = append(m.Resources, &v1alpha2.ResourceModel{})
if err := m.Resources[len(m.Resources)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { if err := m.Resources[len(m.Resources)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err return err
} }

2
staging/src/k8s.io/kubelet/pkg/apis/dra/v1alpha3/api.proto
View File

@@ -98,7 +98,7 @@ message NodeListAndWatchResourcesRequest {
} }
message NodeListAndWatchResourcesResponse { message NodeListAndWatchResourcesResponse {
repeated k8s.io.api.resource.v1alpha2.NodeResourceModel resources = 1; repeated k8s.io.api.resource.v1alpha2.ResourceModel resources = 1;
} }
message Claim { message Claim {

2
test/e2e/dra/dra.go
View File

@@ -911,7 +911,7 @@ var _ = framework.SIGDescribe("node")("DRA", feature.DynamicResourceAllocation,
"ObjectMeta": gstruct.Ignore(), // TODO (https://github.com/kubernetes/kubernetes/issues/123692): validate ownerref "ObjectMeta": gstruct.Ignore(), // TODO (https://github.com/kubernetes/kubernetes/issues/123692): validate ownerref
"NodeName": gomega.Equal(nodeName), "NodeName": gomega.Equal(nodeName),
"DriverName": gomega.Equal(driver.Name), "DriverName": gomega.Equal(driver.Name),
"NodeResourceModel": gomega.Equal(resourcev1alpha2.NodeResourceModel{NamedResources: &resourcev1alpha2.NamedResourcesResources{ "ResourceModel": gomega.Equal(resourcev1alpha2.ResourceModel{NamedResources: &resourcev1alpha2.NamedResourcesResources{
Instances: []resourcev1alpha2.NamedResourcesInstance{{Name: "instance-0"}}, Instances: []resourcev1alpha2.NamedResourcesInstance{{Name: "instance-0"}},
}}), }}),
}), }),

2
test/e2e/dra/test-driver/app/kubeletplugin.go
View File

@@ -354,7 +354,7 @@ func (ex *ExamplePlugin) NodeListAndWatchResources(req *drapbv1alpha3.NodeListAn
instances[i].Name = fmt.Sprintf("instance-%d", i) instances[i].Name = fmt.Sprintf("instance-%d", i)
} }
resp := &drapbv1alpha3.NodeListAndWatchResourcesResponse{ resp := &drapbv1alpha3.NodeListAndWatchResourcesResponse{
Resources: []*resourceapi.NodeResourceModel{ Resources: []*resourceapi.ResourceModel{
{ {
NamedResources: &resourceapi.NamedResourcesResources{ NamedResources: &resourceapi.NamedResourcesResources{
Instances: instances, Instances: instances,

4
test/integration/scheduler_perf/dra.go
View File

@@ -237,13 +237,13 @@ func resourceSlice(driverName, nodeName string, capacity int) *resourcev1alpha2.
NodeName: nodeName, NodeName: nodeName,
DriverName: driverName, DriverName: driverName,
NodeResourceModel: resourcev1alpha2.NodeResourceModel{ ResourceModel: resourcev1alpha2.ResourceModel{
NamedResources: &resourcev1alpha2.NamedResourcesResources{}, NamedResources: &resourcev1alpha2.NamedResourcesResources{},
}, },
} }
for i := 0; i < capacity; i++ { for i := 0; i < capacity; i++ {
slice.NodeResourceModel.NamedResources.Instances = append(slice.NodeResourceModel.NamedResources.Instances, slice.ResourceModel.NamedResources.Instances = append(slice.ResourceModel.NamedResources.Instances,
resourcev1alpha2.NamedResourcesInstance{ resourcev1alpha2.NamedResourcesInstance{
Name: fmt.Sprintf("instance-%d", i), Name: fmt.Sprintf("instance-%d", i),
}, },