CatalogSource: require fields when extracting FBC (#295)

Signed-off-by: Steve Kuznetsov <[email protected]>
Upstream-repository: api
Upstream-commit: 28c6773d2b746559369035cfa3d211360706a247

Author: stevekuznetsov

manifests/0000_50_olm_00-catalogsources.crd.yaml

@@ -537,6 +537,9 @@ spec:
                     extractContent:
                       description: ExtractContent configures the gRPC catalog Pod to extract catalog metadata from the provided index image and use a well-known version of the `opm` server to expose it. The catalog index image that this CatalogSource is configured to use *must* be using the file-based catalogs in order to utilize this feature.
                       type: object
+                      required:
+                        - cacheDir
+                        - catalogDir
                       properties:
                         cacheDir:
                           description: CacheDir is the directory storing the pre-calculated API cache.

staging/api/crds/operators.coreos.com_catalogsources.yaml

@@ -535,6 +535,9 @@ spec:
                     extractContent:
                       description: ExtractContent configures the gRPC catalog Pod to extract catalog metadata from the provided index image and use a well-known version of the `opm` server to expose it. The catalog index image that this CatalogSource is configured to use *must* be using the file-based catalogs in order to utilize this feature.
                       type: object
+                      required:
+                        - cacheDir
+                        - catalogDir
                       properties:
                         cacheDir:
                           description: CacheDir is the directory storing the pre-calculated API cache.

staging/api/crds/zz_defs.go

@@ -172,9 +172,9 @@ type GrpcPodConfig struct {
 // ExtractContentConfig configures context extraction from a file-based catalog index image.
 type ExtractContentConfig struct {
 	// CacheDir is the directory storing the pre-calculated API cache.
-	CacheDir string `json:"cacheDir,omitempty"`
+	CacheDir string `json:"cacheDir"`
 	// CatalogDir is the directory storing the file-based catalog contents.
-	CatalogDir string `json:"catalogDir,omitempty"`
+	CatalogDir string `json:"catalogDir"`
 }
 
 // UpdateStrategy holds all the different types of catalog source update strategies