diff --git a/applyconfigurations/resource/v1alpha2/noderesourcemodel.go b/applyconfigurations/resource/v1alpha2/resourcemodel.go similarity index 66% rename from applyconfigurations/resource/v1alpha2/noderesourcemodel.go rename to applyconfigurations/resource/v1alpha2/resourcemodel.go index 20b7ea861d..8ad7bdf230 100644 --- a/applyconfigurations/resource/v1alpha2/noderesourcemodel.go +++ b/applyconfigurations/resource/v1alpha2/resourcemodel.go @@ -18,22 +18,22 @@ limitations under the License. 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. -type NodeResourceModelApplyConfiguration struct { +type ResourceModelApplyConfiguration struct { 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. -func NodeResourceModel() *NodeResourceModelApplyConfiguration { - return &NodeResourceModelApplyConfiguration{} +func ResourceModel() *ResourceModelApplyConfiguration { + return &ResourceModelApplyConfiguration{} } // 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. // 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 return b } diff --git a/applyconfigurations/resource/v1alpha2/resourceslice.go b/applyconfigurations/resource/v1alpha2/resourceslice.go index 91ff2a3e5e..ff737ce672 100644 --- a/applyconfigurations/resource/v1alpha2/resourceslice.go +++ b/applyconfigurations/resource/v1alpha2/resourceslice.go @@ -30,11 +30,11 @@ import ( // ResourceSliceApplyConfiguration represents an declarative configuration of the ResourceSlice type for use // with apply. type ResourceSliceApplyConfiguration struct { - v1.TypeMetaApplyConfiguration `json:",inline"` - *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` - NodeName *string `json:"nodeName,omitempty"` - DriverName *string `json:"driverName,omitempty"` - NodeResourceModelApplyConfiguration `json:",inline"` + v1.TypeMetaApplyConfiguration `json:",inline"` + *v1.ObjectMetaApplyConfiguration `json:"metadata,omitempty"` + NodeName *string `json:"nodeName,omitempty"` + DriverName *string `json:"driverName,omitempty"` + ResourceModelApplyConfiguration `json:",inline"` } // ResourceSlice constructs an declarative configuration of the ResourceSlice type for use with diff --git a/applyconfigurations/utils.go b/applyconfigurations/utils.go index 2529f03f91..75d9c5c048 100644 --- a/applyconfigurations/utils.go +++ b/applyconfigurations/utils.go @@ -1559,8 +1559,6 @@ func ForKind(kind schema.GroupVersionKind) interface{} { return &resourcev1alpha2.NamedResourcesResourcesApplyConfiguration{} case v1alpha2.SchemeGroupVersion.WithKind("NamedResourcesStringSlice"): return &resourcev1alpha2.NamedResourcesStringSliceApplyConfiguration{} - case v1alpha2.SchemeGroupVersion.WithKind("NodeResourceModel"): - return &resourcev1alpha2.NodeResourceModelApplyConfiguration{} case v1alpha2.SchemeGroupVersion.WithKind("PodSchedulingContext"): return &resourcev1alpha2.PodSchedulingContextApplyConfiguration{} case v1alpha2.SchemeGroupVersion.WithKind("PodSchedulingContextSpec"): @@ -1597,6 +1595,8 @@ func ForKind(kind schema.GroupVersionKind) interface{} { return &resourcev1alpha2.ResourceFilterModelApplyConfiguration{} case v1alpha2.SchemeGroupVersion.WithKind("ResourceHandle"): return &resourcev1alpha2.ResourceHandleApplyConfiguration{} + case v1alpha2.SchemeGroupVersion.WithKind("ResourceModel"): + return &resourcev1alpha2.ResourceModelApplyConfiguration{} case v1alpha2.SchemeGroupVersion.WithKind("ResourceRequest"): return &resourcev1alpha2.ResourceRequestApplyConfiguration{} case v1alpha2.SchemeGroupVersion.WithKind("ResourceRequestModel"): diff --git a/go.mod b/go.mod index c17dea8ad8..64cce78f0d 100644 --- a/go.mod +++ b/go.mod @@ -24,8 +24,8 @@ require ( golang.org/x/term v0.17.0 golang.org/x/time v0.3.0 google.golang.org/protobuf v1.33.0 - k8s.io/api v0.0.0-20240314180239-b048bd80bc44 - k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a + k8s.io/api v0.0.0-20240327161255-35ca1f4086ff + k8s.io/apimachinery v0.0.0-20240307160843-0407311be590 k8s.io/klog/v2 v2.120.1 k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 k8s.io/utils v0.0.0-20230726121419-3b25d923346b @@ -59,8 +59,3 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect ) - -replace ( - k8s.io/api => k8s.io/api v0.0.0-20240314180239-b048bd80bc44 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a -) diff --git a/go.sum b/go.sum index 98e68886e9..7624295d32 100644 --- a/go.sum +++ b/go.sum @@ -153,10 +153,10 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.0.0-20240314180239-b048bd80bc44 h1:e34PNgaXBr5zGyVZObwPJq4DCSrUYwbv+h/35dIMEI4= -k8s.io/api v0.0.0-20240314180239-b048bd80bc44/go.mod h1:RzL8aPQw9ZdVXCdY+Iz3AXnVX+jFyQNqcmzmS+2/Ur0= -k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a h1:0OAuWcxW23YggVeW/f7sDWuEF2U4HDVSN+CQNMxwimI= -k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y= +k8s.io/api v0.0.0-20240327161255-35ca1f4086ff h1:e8yw7ZOfgZIwvHVsyOhDxw48BKRwp6sr/YcSFcfY9eQ= +k8s.io/api v0.0.0-20240327161255-35ca1f4086ff/go.mod h1:jx/i0gF0i9rnbXh49C9IzLaqYOpW+JmxsmUJRq8YNIw= +k8s.io/apimachinery v0.0.0-20240307160843-0407311be590 h1:YFg0j+PVfNLayHtZ3gdTeW12q7HECwhvZm9fWZpXyXo= +k8s.io/apimachinery v0.0.0-20240307160843-0407311be590/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y= k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=