Skip to content

Commit f82e3bf

Browse files
grokspawntmshort
authored andcommitted
make grpcPodConfig.extractContent.cacheDir an optional field (#421)
Upstream-repository: api Upstream-commit: 436783bec2efadaeb51864c212923f8e226d21a3
1 parent 40144f8 commit f82e3bf

File tree

8 files changed

+10
-14
lines changed

8 files changed

+10
-14
lines changed

manifests/0000_50_olm_00-catalogsources.crd.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -979,11 +979,10 @@ spec:
979979
configured to use *must* be using the file-based catalogs in order to utilize this feature.
980980
type: object
981981
required:
982-
- cacheDir
983982
- catalogDir
984983
properties:
985984
cacheDir:
986-
description: CacheDir is the directory storing the pre-calculated API cache.
985+
description: CacheDir is the (optional) directory storing the pre-calculated API cache.
987986
type: string
988987
catalogDir:
989988
description: CatalogDir is the directory storing the file-based catalog contents.

microshift-manifests/0000_50_olm_00-catalogsources.crd.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -979,11 +979,10 @@ spec:
979979
configured to use *must* be using the file-based catalogs in order to utilize this feature.
980980
type: object
981981
required:
982-
- cacheDir
983982
- catalogDir
984983
properties:
985984
cacheDir:
986-
description: CacheDir is the directory storing the pre-calculated API cache.
985+
description: CacheDir is the (optional) directory storing the pre-calculated API cache.
987986
type: string
988987
catalogDir:
989988
description: CatalogDir is the directory storing the file-based catalog contents.

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -975,11 +975,10 @@ spec:
975975
configured to use *must* be using the file-based catalogs in order to utilize this feature.
976976
type: object
977977
required:
978-
- cacheDir
979978
- catalogDir
980979
properties:
981980
cacheDir:
982-
description: CacheDir is the directory storing the pre-calculated API cache.
981+
description: CacheDir is the (optional) directory storing the pre-calculated API cache.
983982
type: string
984983
catalogDir:
985984
description: CatalogDir is the directory storing the file-based catalog contents.

staging/api/crds/zz_defs.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

staging/api/pkg/operators/v1alpha1/catalogsource_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ type GrpcPodConfig struct {
168168

169169
// ExtractContentConfig configures context extraction from a file-based catalog index image.
170170
type ExtractContentConfig struct {
171-
// CacheDir is the directory storing the pre-calculated API cache.
172-
CacheDir string `json:"cacheDir"`
171+
// CacheDir is the (optional) directory storing the pre-calculated API cache.
172+
CacheDir string `json:"cacheDir,omitempty"`
173173
// CatalogDir is the directory storing the file-based catalog contents.
174174
CatalogDir string `json:"catalogDir"`
175175
}

vendor/github.com/operator-framework/api/crds/operators.coreos.com_catalogsources.yaml

+1-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/operator-framework/api/crds/zz_defs.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/operator-framework/api/pkg/operators/v1alpha1/catalogsource_types.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)