Skip to content

Commit b4632b7

Browse files
Merge pull request #123932 from pohly/dra-api-resource-model-rename
dra api: NodeResourceModel -> ResourceModel Kubernetes-commit: d194e6d06c4f1004cebe00f2c539a564f77276ec
2 parents 4467b1e + 650f392 commit b4632b7

File tree

5 files changed

+19
-24
lines changed

5 files changed

+19
-24
lines changed

applyconfigurations/resource/v1alpha2/noderesourcemodel.go renamed to applyconfigurations/resource/v1alpha2/resourcemodel.go

+6-6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

applyconfigurations/resource/v1alpha2/resourceslice.go

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

applyconfigurations/utils.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

+2-7
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ require (
2424
golang.org/x/term v0.17.0
2525
golang.org/x/time v0.3.0
2626
google.golang.org/protobuf v1.33.0
27-
k8s.io/api v0.0.0-20240314180239-b048bd80bc44
28-
k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a
27+
k8s.io/api v0.0.0-20240327161255-35ca1f4086ff
28+
k8s.io/apimachinery v0.0.0-20240307160843-0407311be590
2929
k8s.io/klog/v2 v2.120.1
3030
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
3131
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
@@ -59,8 +59,3 @@ require (
5959
gopkg.in/yaml.v2 v2.4.0 // indirect
6060
gopkg.in/yaml.v3 v3.0.1 // indirect
6161
)
62-
63-
replace (
64-
k8s.io/api => k8s.io/api v0.0.0-20240314180239-b048bd80bc44
65-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a
66-
)

go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -153,10 +153,10 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
153153
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
154154
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
155155
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
156-
k8s.io/api v0.0.0-20240314180239-b048bd80bc44 h1:e34PNgaXBr5zGyVZObwPJq4DCSrUYwbv+h/35dIMEI4=
157-
k8s.io/api v0.0.0-20240314180239-b048bd80bc44/go.mod h1:RzL8aPQw9ZdVXCdY+Iz3AXnVX+jFyQNqcmzmS+2/Ur0=
158-
k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a h1:0OAuWcxW23YggVeW/f7sDWuEF2U4HDVSN+CQNMxwimI=
159-
k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
156+
k8s.io/api v0.0.0-20240327161255-35ca1f4086ff h1:e8yw7ZOfgZIwvHVsyOhDxw48BKRwp6sr/YcSFcfY9eQ=
157+
k8s.io/api v0.0.0-20240327161255-35ca1f4086ff/go.mod h1:jx/i0gF0i9rnbXh49C9IzLaqYOpW+JmxsmUJRq8YNIw=
158+
k8s.io/apimachinery v0.0.0-20240307160843-0407311be590 h1:YFg0j+PVfNLayHtZ3gdTeW12q7HECwhvZm9fWZpXyXo=
159+
k8s.io/apimachinery v0.0.0-20240307160843-0407311be590/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
160160
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
161161
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
162162
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

0 commit comments

Comments
 (0)