Skip to content

Commit f25efd1

Browse files
PartialObjectMetadataList should nest values, not pointers for Items
Typo during setting up PartialObjectMetadataList, it should be a slice of `PartialObjectMetadata`, not a slice of `*PartialObjectMetadata`.
1 parent 3d12466 commit f25efd1

File tree

9 files changed

+207
-215
lines changed

9 files changed

+207
-215
lines changed

staging/src/k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor/tableconvertor_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ func Test_convertor_ConvertToTable(t *testing.T) {
123123
},
124124
args: args{
125125
obj: &metav1beta1.PartialObjectMetadataList{
126-
Items: []*metav1beta1.PartialObjectMetadata{
126+
Items: []metav1beta1.PartialObjectMetadata{
127127
{ObjectMeta: metav1.ObjectMeta{Name: "blah", CreationTimestamp: metav1.NewTime(time.Unix(1, 0))}},
128128
{ObjectMeta: metav1.ObjectMeta{Name: "blah-2", CreationTimestamp: metav1.NewTime(time.Unix(2, 0))}},
129129
},

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go

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

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1309,5 +1309,5 @@ type PartialObjectMetadataList struct {
13091309
ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
13101310

13111311
// items contains each of the included items.
1312-
Items []*PartialObjectMetadata `json:"items" protobuf:"bytes,2,rep,name=items"`
1312+
Items []PartialObjectMetadata `json:"items" protobuf:"bytes,2,rep,name=items"`
13131313
}

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go

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

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go

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

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ type PartialObjectMetadataList struct {
6868
v1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,2,opt,name=metadata"`
6969

7070
// items contains each of the included items.
71-
Items []*v1.PartialObjectMetadata `json:"items" protobuf:"bytes,1,rep,name=items"`
71+
Items []v1.PartialObjectMetadata `json:"items" protobuf:"bytes,1,rep,name=items"`
7272
}
7373

7474
const (

staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.deepcopy.go

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

staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2378,7 +2378,7 @@ func TestGetPartialObjectMetadata(t *testing.T) {
23782378
ResourceVersion: "10",
23792379
SelfLink: "/test/link",
23802380
},
2381-
Items: []*metav1beta1.PartialObjectMetadata{
2381+
Items: []metav1beta1.PartialObjectMetadata{
23822382
{
23832383
TypeMeta: metav1.TypeMeta{APIVersion: "meta.k8s.io/v1beta1", Kind: "PartialObjectMetadata"},
23842384
ObjectMeta: metav1.ObjectMeta{Name: "foo1", Namespace: "ns1", CreationTimestamp: now, UID: types.UID("newer")},

staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ func asPartialObjectMetadataList(result runtime.Object, groupVersion schema.Grou
220220
}
221221
partial := meta.AsPartialObjectMetadata(m)
222222
partial.GetObjectKind().SetGroupVersionKind(gvk)
223-
list.Items = append(list.Items, partial)
223+
list.Items = append(list.Items, *partial)
224224
return nil
225225
})
226226
if err != nil {
@@ -240,7 +240,7 @@ func asPartialObjectMetadataList(result runtime.Object, groupVersion schema.Grou
240240
}
241241
partial := meta.AsPartialObjectMetadata(m)
242242
partial.GetObjectKind().SetGroupVersionKind(gvk)
243-
list.Items = append(list.Items, partial)
243+
list.Items = append(list.Items, *partial)
244244
return nil
245245
})
246246
if err != nil {

0 commit comments

Comments
 (0)