Skip to content

Commit 070424b

Browse files
Fix metadata adding omitempty
1 parent 0198d4b commit 070424b

File tree

7 files changed

+2
-8
lines changed

7 files changed

+2
-8
lines changed

api/v1/clustercatalog_types.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ type ClusterCatalog struct {
5858

5959
// metadata is the standard object's metadata.
6060
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
61-
metav1.ObjectMeta `json:"metadata"`
61+
metav1.ObjectMeta `json:"metadata,omitempty"`
6262

6363
// spec is a required field that defines the desired state of the ClusterCatalog.
6464
// The controller ensures that the catalog is unpacked and served over the catalog content HTTP server.
@@ -81,7 +81,7 @@ type ClusterCatalogList struct {
8181

8282
// metadata is the standard object's metadata.
8383
// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
84-
metav1.ListMeta `json:"metadata"`
84+
metav1.ListMeta `json:"metadata,omitempty"`
8585

8686
// items is a list of ClusterCatalogs.
8787
// items is required.

helm/olmv1/base/catalogd/crd/experimental/olm.operatorframework.io_clustercatalogs.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@ spec:
416416
type: object
417417
type: object
418418
required:
419-
- metadata
420419
- spec
421420
type: object
422421
served: true

helm/olmv1/base/catalogd/crd/standard/olm.operatorframework.io_clustercatalogs.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,6 @@ spec:
416416
type: object
417417
type: object
418418
required:
419-
- metadata
420419
- spec
421420
type: object
422421
served: true

manifests/experimental-e2e.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@ spec:
602602
type: object
603603
type: object
604604
required:
605-
- metadata
606605
- spec
607606
type: object
608607
served: true

manifests/experimental.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,6 @@ spec:
563563
type: object
564564
type: object
565565
required:
566-
- metadata
567566
- spec
568567
type: object
569568
served: true

manifests/standard-e2e.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -602,7 +602,6 @@ spec:
602602
type: object
603603
type: object
604604
required:
605-
- metadata
606605
- spec
607606
type: object
608607
served: true

manifests/standard.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,6 @@ spec:
563563
type: object
564564
type: object
565565
required:
566-
- metadata
567566
- spec
568567
type: object
569568
served: true

0 commit comments

Comments
 (0)