catalogsource: update dir name (openshift#294)

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

Author: stevekuznetsov

manifests/0000_50_olm_00-catalogsources.crd.yaml

@@ -537,14 +537,12 @@ 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:
-                        - configDir
                       properties:
                         cacheDir:
                           description: CacheDir is the directory storing the pre-calculated API cache.
                           type: string
-                        configDir:
-                          description: ConfigDir is the directory storing the file-based catalog contents.
+                        catalogDir:
+                          description: CatalogDir is the directory storing the file-based catalog contents.
                           type: string
                     memoryTarget:
                       description: "MemoryTarget configures the $GOMEMLIMIT value for the gRPC catalog Pod. This is a soft memory limit for the server, which the runtime will attempt to meet but makes no guarantees that it will do so. If this value is set, the Pod will have the following modifications made to the container running the server: - the $GOMEMLIMIT environment variable will be set to this value in bytes - the memory request will be set to this value \n This field should be set if it's desired to reduce the footprint of a catalog server as much as possible, or if a catalog being served is very large and needs more than the default allocation. If your index image has a file- system cache, determine a good approximation for this value by doubling the size of the package cache at /tmp/cache/cache/packages.json in the index image. \n This field is best-effort; if unset, no default will be used and no Pod memory limit or $GOMEMLIMIT value will be set."

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

@@ -535,14 +535,12 @@ 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:
-                        - configDir
                       properties:
                         cacheDir:
                           description: CacheDir is the directory storing the pre-calculated API cache.
                           type: string
-                        configDir:
-                          description: ConfigDir is the directory storing the file-based catalog contents.
+                        catalogDir:
+                          description: CatalogDir is the directory storing the file-based catalog contents.
                           type: string
                     memoryTarget:
                       description: "MemoryTarget configures the $GOMEMLIMIT value for the gRPC catalog Pod. This is a soft memory limit for the server, which the runtime will attempt to meet but makes no guarantees that it will do so. If this value is set, the Pod will have the following modifications made to the container running the server: - the $GOMEMLIMIT environment variable will be set to this value in bytes - the memory request will be set to this value \n This field should be set if it's desired to reduce the footprint of a catalog server as much as possible, or if a catalog being served is very large and needs more than the default allocation. If your index image has a file- system cache, determine a good approximation for this value by doubling the size of the package cache at /tmp/cache/cache/packages.json in the index image. \n This field is best-effort; if unset, no default will be used and no Pod memory limit or $GOMEMLIMIT value will be set."

staging/api/crds/zz_defs.go

@@ -173,8 +173,8 @@ type GrpcPodConfig struct {
 type ExtractContentConfig struct {
 	// CacheDir is the directory storing the pre-calculated API cache.
 	CacheDir string `json:"cacheDir,omitempty"`
-	// ConfigDir is the directory storing the file-based catalog contents.
-	ConfigDir string `json:"configDir,omitempty	"`
+	// CatalogDir is the directory storing the file-based catalog contents.
+	CatalogDir string `json:"catalogDir,omitempty"`
 }
 
 // UpdateStrategy holds all the different types of catalog source update strategies