api: Remove list metadata from AppWrapperResourceList

astefanutti · astefanutti · commit fc1d1bd55726 · 2023-07-25T13:34:56.000+02:00
diff --git a/config/crd/bases/mcad.ibm.com_appwrappers.yaml b/config/crd/bases/mcad.ibm.com_appwrappers.yaml
@@ -129,67 +129,6 @@ spec:
                           type: integer
                       type: object
                     type: array
-                  apiVersion:
-                    description: 'APIVersion defines the versioned schema of this
-                      representation of an object. Servers should convert recognized
-                      schemas to the latest internal value, and may reject unrecognized
-                      values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-                    type: string
-                  kind:
-                    description: 'Kind is a string value representing the REST resource
-                      this object represents. Servers may infer this from the endpoint
-                      the client submits requests to. Cannot be updated. In CamelCase.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                    type: string
-                  metadata:
-                    description: ListMeta describes metadata that synthetic resources
-                      must have, including lists and various status objects. A resource
-                      may have only one of {ObjectMeta, ListMeta}.
-                    properties:
-                      continue:
-                        description: continue may be set if the user set a limit on
-                          the number of items returned, and indicates that the server
-                          has more data available. The value is opaque and may be
-                          used to issue another request to the endpoint that served
-                          this list to retrieve the next set of available objects.
-                          Continuing a consistent list may not be possible if the
-                          server configuration has changed or more than a few minutes
-                          have passed. The resourceVersion field returned when using
-                          this continue value will be identical to the value in the
-                          first response, unless you have received this token from
-                          an error message.
-                        type: string
-                      remainingItemCount:
-                        description: remainingItemCount is the number of subsequent
-                          items in the list which are not included in this list response.
-                          If the list request contained label or field selectors,
-                          then the number of remaining items is unknown and the field
-                          will be left unset and omitted during serialization. If
-                          the list is complete (either because it is not chunking
-                          or because this is the last chunk), then there are no more
-                          remaining items and this field will be left unset and omitted
-                          during serialization. Servers older than v1.15 do not set
-                          this field. The intended use of the remainingItemCount is
-                          *estimating* the size of a collection. Clients should not
-                          rely on the remainingItemCount to be set or to be exact.
-                        format: int64
-                        type: integer
-                      resourceVersion:
-                        description: 'String that identifies the server''s internal
-                          version of this object that can be used by clients to determine
-                          when objects have changed. Value must be treated as opaque
-                          by clients and passed unmodified back to the server. Populated
-                          by the system. Read-only. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                        type: string
-                      selfLink:
-                        description: "selfLink is a URL representing this object.
-                          Populated by the system. Read-only. \n DEPRECATED Kubernetes
-                          will stop propagating this field in 1.20 release and the
-                          field is planned to be removed in 1.21 release."
-                        type: string
-                    type: object
-                required:
-                - metadata
                 type: object
               schedulingSpec:
                 description: SchedSpec specifies the parameters used for scheduling
diff --git a/deployment/mcad-controller/crds/mcad.ibm.com_appwrappers.yaml b/deployment/mcad-controller/crds/mcad.ibm.com_appwrappers.yaml
@@ -129,67 +129,6 @@ spec:
                           type: integer
                       type: object
                     type: array
-                  apiVersion:
-                    description: 'APIVersion defines the versioned schema of this
-                      representation of an object. Servers should convert recognized
-                      schemas to the latest internal value, and may reject unrecognized
-                      values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
-                    type: string
-                  kind:
-                    description: 'Kind is a string value representing the REST resource
-                      this object represents. Servers may infer this from the endpoint
-                      the client submits requests to. Cannot be updated. In CamelCase.
-                      More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
-                    type: string
-                  metadata:
-                    description: ListMeta describes metadata that synthetic resources
-                      must have, including lists and various status objects. A resource
-                      may have only one of {ObjectMeta, ListMeta}.
-                    properties:
-                      continue:
-                        description: continue may be set if the user set a limit on
-                          the number of items returned, and indicates that the server
-                          has more data available. The value is opaque and may be
-                          used to issue another request to the endpoint that served
-                          this list to retrieve the next set of available objects.
-                          Continuing a consistent list may not be possible if the
-                          server configuration has changed or more than a few minutes
-                          have passed. The resourceVersion field returned when using
-                          this continue value will be identical to the value in the
-                          first response, unless you have received this token from
-                          an error message.
-                        type: string
-                      remainingItemCount:
-                        description: remainingItemCount is the number of subsequent
-                          items in the list which are not included in this list response.
-                          If the list request contained label or field selectors,
-                          then the number of remaining items is unknown and the field
-                          will be left unset and omitted during serialization. If
-                          the list is complete (either because it is not chunking
-                          or because this is the last chunk), then there are no more
-                          remaining items and this field will be left unset and omitted
-                          during serialization. Servers older than v1.15 do not set
-                          this field. The intended use of the remainingItemCount is
-                          *estimating* the size of a collection. Clients should not
-                          rely on the remainingItemCount to be set or to be exact.
-                        format: int64
-                        type: integer
-                      resourceVersion:
-                        description: 'String that identifies the server''s internal
-                          version of this object that can be used by clients to determine
-                          when objects have changed. Value must be treated as opaque
-                          by clients and passed unmodified back to the server. Populated
-                          by the system. Read-only. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
-                        type: string
-                      selfLink:
-                        description: "selfLink is a URL representing this object.
-                          Populated by the system. Read-only. \n DEPRECATED Kubernetes
-                          will stop propagating this field in 1.20 release and the
-                          field is planned to be removed in 1.21 release."
-                        type: string
-                    type: object
-                required:
-                - metadata
                 type: object
               schedulingSpec:
                 description: SchedSpec specifies the parameters used for scheduling
diff --git a/pkg/apis/controller/v1beta1/appwrapper.go b/pkg/apis/controller/v1beta1/appwrapper.go
@@ -73,9 +73,6 @@ type AppWrapperSpec struct {
 
 // a collection of AppWrapperResource
 type AppWrapperResourceList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata"`
-
 	// +optional
 	GenericItems []AppWrapperGenericResource `json:"GenericItems"`
 }
diff --git a/pkg/apis/controller/v1beta1/zz_generated.deepcopy.go b/pkg/apis/controller/v1beta1/zz_generated.deepcopy.go
diff --git a/test/e2e-kuttl-deployment-01/steps/03-install.yaml b/test/e2e-kuttl-deployment-01/steps/03-install.yaml
@@ -11,7 +11,6 @@ spec:
             growthType: "none"
             maxNumRequeuings: 3
     resources:
-        Items: []
         GenericItems:
             - replicas: 1
               completionstatus: Complete
diff --git a/test/e2e-kuttl-deployment-01/steps/06-install.yaml b/test/e2e-kuttl-deployment-01/steps/06-install.yaml
@@ -11,7 +11,6 @@ spec:
             growthType: "none"
             maxNumRequeuings: 1
     resources:
-        Items: []
         GenericItems:
             - replicas: 1
               completionstatus: Complete
diff --git a/test/e2e-kuttl/quota-forest/04-install.yaml b/test/e2e-kuttl/quota-forest/04-install.yaml
@@ -10,11 +10,8 @@ spec:
   service:
     spec: {}
   resources:
-    metadata: {}
-    Items: []
     GenericItems:
-      - metadata: {}
-        replicas: 1
+      - replicas: 1
         generictemplate:
           apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
           kind: StatefulSet
diff --git a/test/e2e-kuttl/quota-forest/05-install.yaml b/test/e2e-kuttl/quota-forest/05-install.yaml
@@ -10,10 +10,8 @@ spec:
   service:
     spec: {}
   resources:
-    metadata: {}
     GenericItems:
-      - metadata: {}
-        replicas: 1
+      - replicas: 1
         generictemplate:
           apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
           kind: StatefulSet
diff --git a/test/e2e-kuttl/quota-forest/06-install.yaml b/test/e2e-kuttl/quota-forest/06-install.yaml
@@ -11,10 +11,8 @@ spec:
     spec: {}
   priority: 1000
   resources:
-    metadata: {}
     GenericItems:
-      - metadata: {}
-        replicas: 1
+      - replicas: 1
         generictemplate:
           apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
           kind: StatefulSet
diff --git a/test/e2e-kuttl/quota-forest/07-install.yaml b/test/e2e-kuttl/quota-forest/07-install.yaml
@@ -11,10 +11,8 @@ spec:
     spec: {}
   priority: 1000
   resources:
-    metadata: {}
     GenericItems:
-      - metadata: {}
-        replicas: 1
+      - replicas: 1
         generictemplate:
           apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
           kind: StatefulSet
diff --git a/test/e2e-kuttl/quota-forest/08-install.yaml b/test/e2e-kuttl/quota-forest/08-install.yaml
@@ -11,10 +11,8 @@ spec:
     spec: {}
   priority: 1000
   resources:
-    metadata: {}
     GenericItems:
-      - metadata: {}
-        replicas: 1
+      - replicas: 1
         generictemplate:
           apiVersion: apps/v1 # for versions before 1.9.0 use apps/v1beta2
           kind: StatefulSet
diff --git a/test/e2e/util.go b/test/e2e/util.go

Original file line number	Diff line number	Diff line change
`@@ -73,9 +73,6 @@ type AppWrapperSpec struct {`
`73`	`73`
`74`	`74`	`// a collection of AppWrapperResource`
`75`	`75`	`type AppWrapperResourceList struct {`
`76`		- metav1.TypeMeta `json:",inline"`
`77`		- metav1.ListMeta `json:"metadata"`
`78`		`-`
`79`	`76`	`// +optional`
`80`	`77`	GenericItems []AppWrapperGenericResource `json:"GenericItems"`
`81`	`78`	`}`