From 0bb827c29ee3eb938b536ce947970c51390f5da7 Mon Sep 17 00:00:00 2001
From: Joe Lanford <joe.lanford@gmail.com>
Date: Wed, 7 Jun 2023 17:15:05 -0400
Subject: [PATCH] bundlemetadata: make related images and properties optional

Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
---
 api/core/v1alpha1/bundlemetadata_types.go                   | 4 ++--
 .../bases/catalogd.operatorframework.io_bundlemetadata.yaml | 2 --
 test/e2e/unpack_test.go                                     | 6 ------
 testdata/catalogs/test-catalog/catalog.yaml                 | 3 ---
 4 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/api/core/v1alpha1/bundlemetadata_types.go b/api/core/v1alpha1/bundlemetadata_types.go
index 7af4908b..ef4c9a2b 100644
--- a/api/core/v1alpha1/bundlemetadata_types.go
+++ b/api/core/v1alpha1/bundlemetadata_types.go
@@ -57,10 +57,10 @@ type BundleMetadataSpec struct {
 	Image string `json:"image"`
 
 	// Properties is a string of references to property objects that are part of the bundle
-	Properties []Property `json:"properties"`
+	Properties []Property `json:"properties,omitempty"`
 
 	// RelatedImages are the RelatedImages in the bundle
-	RelatedImages []RelatedImage `json:"relatedImages"`
+	RelatedImages []RelatedImage `json:"relatedImages,omitempty"`
 }
 
 type Property struct {
diff --git a/config/crd/bases/catalogd.operatorframework.io_bundlemetadata.yaml b/config/crd/bases/catalogd.operatorframework.io_bundlemetadata.yaml
index 21b89a5c..7557bf5b 100644
--- a/config/crd/bases/catalogd.operatorframework.io_bundlemetadata.yaml
+++ b/config/crd/bases/catalogd.operatorframework.io_bundlemetadata.yaml
@@ -87,8 +87,6 @@ spec:
             - catalog
             - image
             - package
-            - properties
-            - relatedImages
             type: object
           status:
             description: BundleMetadataStatus defines the observed state of BundleMetadata
diff --git a/test/e2e/unpack_test.go b/test/e2e/unpack_test.go
index 7e108fa5..b5ff023b 100644
--- a/test/e2e/unpack_test.go
+++ b/test/e2e/unpack_test.go
@@ -100,12 +100,6 @@ var _ = Describe("Catalog Unpacking", func() {
 						Value: json.RawMessage(`{"packageName":"prometheus","version":"0.47.0"}`),
 					},
 				},
-				RelatedImages: []catalogd.RelatedImage{
-					{
-						Name:  "",
-						Image: "",
-					},
-				},
 			}
 			err = c.Get(ctx, types.NamespacedName{Name: fmt.Sprintf("%s-%s", catalog.Name, bundle)}, bm)
 			Expect(err).ToNot(HaveOccurred())
diff --git a/testdata/catalogs/test-catalog/catalog.yaml b/testdata/catalogs/test-catalog/catalog.yaml
index 8c605087..14d33b9d 100644
--- a/testdata/catalogs/test-catalog/catalog.yaml
+++ b/testdata/catalogs/test-catalog/catalog.yaml
@@ -13,9 +13,6 @@ schema: olm.bundle
 name: prometheus-operator.0.47.0
 package: prometheus
 image: localhost/testdata/bundles/registry-v1/prometheus-operator:v0.47.0
-relatedImages:
-  - name: ""
-    image: ""
 properties:
   - type: olm.package
     value: