Skip to content

Commit cb37e84

Browse files
pohlyk8s-publishing-bot
authored andcommitted
dra api: NodeResourceModel -> ResourceModel
When renaming NodeResourceSlice to ResourceSlice, the embedded [Node]ResourceModel also should have been renamed. Kubernetes-commit: a0add8d2c7578cd9f94fc302d6212f9f7d16175b
1 parent d555812 commit cb37e84

4 files changed

Lines changed: 67 additions & 72 deletions

File tree

go.mod

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ require (
99
github.com/gogo/protobuf v1.3.2
1010
github.com/stretchr/testify v1.8.4
1111
google.golang.org/grpc v1.58.3
12-
k8s.io/api v0.0.0-20240308035331-170523fbf722
12+
k8s.io/api v0.0.0-20240327161255-35ca1f4086ff
1313
k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a
14-
k8s.io/apiserver v0.0.0-20240307053455-8763b7fa93af
15-
k8s.io/client-go v0.0.0-20240308040359-84dfaee610db
16-
k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae
17-
k8s.io/cri-api v0.0.0-20240306174858-30022f215cd7
14+
k8s.io/apiserver v0.0.0-20240314211425-d5a86072033f
15+
k8s.io/client-go v0.0.0-20240327162728-b4632b75ff72
16+
k8s.io/component-base v0.0.0-20240327164446-ecbd1b6f465d
17+
k8s.io/cri-api v0.0.0-20240327181501-1931560526bc
1818
k8s.io/klog/v2 v2.120.1
1919
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2020
)
@@ -61,11 +61,6 @@ require (
6161
)
6262

6363
replace (
64-
k8s.io/api => k8s.io/api v0.0.0-20240308035331-170523fbf722
65-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a
66-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20240307053455-8763b7fa93af
67-
k8s.io/client-go => k8s.io/client-go v0.0.0-20240308040359-84dfaee610db
68-
k8s.io/component-base => k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae
69-
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20240306174858-30022f215cd7
70-
k8s.io/kms => k8s.io/kms v0.0.0-20240306172340-03c9a46c21c7
64+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20240307160843-0407311be590
65+
k8s.io/kms => k8s.io/kms v0.0.0-20240327165525-6bf80055228c
7166
)

go.sum

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,18 @@ gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
155155
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
156156
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
157157
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
158-
k8s.io/api v0.0.0-20240308035331-170523fbf722 h1:swjp6yzL9EF0cshDk/jlg1EHNO3Iue//QmzbLZ69czQ=
159-
k8s.io/api v0.0.0-20240308035331-170523fbf722/go.mod h1:RzL8aPQw9ZdVXCdY+Iz3AXnVX+jFyQNqcmzmS+2/Ur0=
160-
k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a h1:0OAuWcxW23YggVeW/f7sDWuEF2U4HDVSN+CQNMxwimI=
161-
k8s.io/apimachinery v0.0.0-20240307171817-d82afe1e363a/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
162-
k8s.io/apiserver v0.0.0-20240307053455-8763b7fa93af h1:t14mpLj8FMKgkyGchVjIIq7RwowDSPuxw5os6m5hc00=
163-
k8s.io/apiserver v0.0.0-20240307053455-8763b7fa93af/go.mod h1:HmmYDBhRoIbxko8OQcZG4K/ZPSY5cAcH1+c10kAKSyo=
164-
k8s.io/client-go v0.0.0-20240308040359-84dfaee610db h1:/1rjE0C7CWKB9yehiULR49Si2FotuLBSQdKrT7m8D04=
165-
k8s.io/client-go v0.0.0-20240308040359-84dfaee610db/go.mod h1:kXL1J6dxir2v5J78d2G2gEzBZddvZ9VNNW3suRFjJ4o=
166-
k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae h1:/bnYoyvHvOnxGRpKc3z/RG0R/gzUwIFg2zKk8UkVchM=
167-
k8s.io/component-base v0.0.0-20240306172020-b0a6e40497ae/go.mod h1:xHRknJm8Q13BCZjYtVCjnJJEzKC9RMj6OqPgtPWU8yI=
168-
k8s.io/cri-api v0.0.0-20240306174858-30022f215cd7 h1:o1vyAxRQmWVt0b5weAVbqFgJvV9PtC9qNfeSt9sZAD4=
169-
k8s.io/cri-api v0.0.0-20240306174858-30022f215cd7/go.mod h1:4MvRsG7Jr/C0uyVjCforyO0BNJJlngqcMRsJvObl4q0=
158+
k8s.io/api v0.0.0-20240327161255-35ca1f4086ff h1:e8yw7ZOfgZIwvHVsyOhDxw48BKRwp6sr/YcSFcfY9eQ=
159+
k8s.io/api v0.0.0-20240327161255-35ca1f4086ff/go.mod h1:jx/i0gF0i9rnbXh49C9IzLaqYOpW+JmxsmUJRq8YNIw=
160+
k8s.io/apimachinery v0.0.0-20240307160843-0407311be590 h1:YFg0j+PVfNLayHtZ3gdTeW12q7HECwhvZm9fWZpXyXo=
161+
k8s.io/apimachinery v0.0.0-20240307160843-0407311be590/go.mod h1:wEJvNDlfxMRaMhyv38SIHIEC9hah/xuzqUUhxIyUv7Y=
162+
k8s.io/apiserver v0.0.0-20240314211425-d5a86072033f h1:ncHh7ZFjeW8B7Mhk7vX2T7N35k647ZobKAF77bTm8OM=
163+
k8s.io/apiserver v0.0.0-20240314211425-d5a86072033f/go.mod h1:Qc4/TcRbvDqRW6JFbzNFiKgdznds1lzdavVbgta+Usc=
164+
k8s.io/client-go v0.0.0-20240327162728-b4632b75ff72 h1:y9IcxUEL6hCk7C9ZF4dbnXEOyevBqCC44/Vk7+ULtGg=
165+
k8s.io/client-go v0.0.0-20240327162728-b4632b75ff72/go.mod h1:fYOmyOV2J9kzMfM6niYhBrIRZe0v3uEnUK0iPpOBOHs=
166+
k8s.io/component-base v0.0.0-20240327164446-ecbd1b6f465d h1:ElzOwFH19gmQPM7aqZ7+fYZp0EID1DEybYBEDdd6RrM=
167+
k8s.io/component-base v0.0.0-20240327164446-ecbd1b6f465d/go.mod h1:A/J8LmrMt2JRruTIpFoVJBF/zxF9tKg/rTcFjeI2F8M=
168+
k8s.io/cri-api v0.0.0-20240327181501-1931560526bc h1:zosADAHEyaYDWeUJ0Shzl2Nq5bO0vxyUe15ynEUPGY4=
169+
k8s.io/cri-api v0.0.0-20240327181501-1931560526bc/go.mod h1:4MvRsG7Jr/C0uyVjCforyO0BNJJlngqcMRsJvObl4q0=
170170
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
171171
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
172172
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 h1:BZqlfIlq5YbRMFko6/PM7FjZpUb45WallggurYhKGag=

pkg/apis/dra/v1alpha3/api.pb.go

Lines changed: 47 additions & 47 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/dra/v1alpha3/api.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ message NodeListAndWatchResourcesRequest {
9898
}
9999

100100
message NodeListAndWatchResourcesResponse {
101-
repeated k8s.io.api.resource.v1alpha2.NodeResourceModel resources = 1;
101+
repeated k8s.io.api.resource.v1alpha2.ResourceModel resources = 1;
102102
}
103103

104104
message Claim {

0 commit comments

Comments
 (0)