Merge pull request kubernetes#77827 from smarterclayton/fix_partial

PartialObjectMetadataList should nest values, not pointers for Items
madhanrm · May 14, 2019 · 91ba27e · 91ba27e
2 parents 12832d9 + f25efd1
commit 91ba27e
Show file tree

Hide file tree

Showing 9 changed files with 207 additions and 215 deletions.
diff --git a/...apiextensions-apiserver/pkg/registry/customresource/tableconvertor/tableconvertor_test.go b/...apiextensions-apiserver/pkg/registry/customresource/tableconvertor/tableconvertor_test.go
@@ -123,7 +123,7 @@ func Test_convertor_ConvertToTable(t *testing.T) {
 			},
 			args: args{
 				obj: &metav1beta1.PartialObjectMetadataList{
-					Items: []*metav1beta1.PartialObjectMetadata{
+					Items: []metav1beta1.PartialObjectMetadata{
 						{ObjectMeta: metav1.ObjectMeta{Name: "blah", CreationTimestamp: metav1.NewTime(time.Unix(1, 0))}},
 						{ObjectMeta: metav1.ObjectMeta{Name: "blah-2", CreationTimestamp: metav1.NewTime(time.Unix(2, 0))}},
 					},

diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/types.go
@@ -1309,5 +1309,5 @@ type PartialObjectMetadataList struct {
 	ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
 
 	// items contains each of the included items.
-	Items []*PartialObjectMetadata `json:"items" protobuf:"bytes,2,rep,name=items"`
+	Items []PartialObjectMetadata `json:"items" protobuf:"bytes,2,rep,name=items"`
 }
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/zz_generated.deepcopy.go
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/generated.pb.go
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/types.go
@@ -68,7 +68,7 @@ type PartialObjectMetadataList struct {
 	v1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,2,opt,name=metadata"`
 
 	// items contains each of the included items.
-	Items []*v1.PartialObjectMetadata `json:"items" protobuf:"bytes,1,rep,name=items"`
+	Items []v1.PartialObjectMetadata `json:"items" protobuf:"bytes,1,rep,name=items"`
 }
 
 const (

diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1beta1/zz_generated.deepcopy.go
diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go b/staging/src/k8s.io/apiserver/pkg/endpoints/apiserver_test.go
@@ -2378,7 +2378,7 @@ func TestGetPartialObjectMetadata(t *testing.T) {
 					ResourceVersion: "10",
 					SelfLink:        "/test/link",
 				},
-				Items: []*metav1beta1.PartialObjectMetadata{
+				Items: []metav1beta1.PartialObjectMetadata{
 					{
 						TypeMeta:   metav1.TypeMeta{APIVersion: "meta.k8s.io/v1beta1", Kind: "PartialObjectMetadata"},
 						ObjectMeta: metav1.ObjectMeta{Name: "foo1", Namespace: "ns1", CreationTimestamp: now, UID: types.UID("newer")},

diff --git a/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go b/staging/src/k8s.io/apiserver/pkg/endpoints/handlers/response.go
@@ -220,7 +220,7 @@ func asPartialObjectMetadataList(result runtime.Object, groupVersion schema.Grou
 			}
 			partial := meta.AsPartialObjectMetadata(m)
 			partial.GetObjectKind().SetGroupVersionKind(gvk)
-			list.Items = append(list.Items, partial)
+			list.Items = append(list.Items, *partial)
 			return nil
 		})
 		if err != nil {
@@ -240,7 +240,7 @@ func asPartialObjectMetadataList(result runtime.Object, groupVersion schema.Grou
 			}
 			partial := meta.AsPartialObjectMetadata(m)
 			partial.GetObjectKind().SetGroupVersionKind(gvk)
-			list.Items = append(list.Items, partial)
+			list.Items = append(list.Items, *partial)
 			return nil
 		})
 		if err != nil {