Skip to content

Commit 32213b1

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #567 from stevekuznetsov/skuznets/bump-all
Skuznets/bump all
2 parents ab674aa + 4579920 commit 32213b1

File tree

176 files changed

+5214
-1829
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

176 files changed

+5214
-1829
lines changed

‎Makefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ ifeq (, $(wildcard $(KUBEBUILDER_ASSETS)/kube-apiserver))
5555
$(error kube-apiserver $(KUBEBUILDER_ASSETS_ERR))
5656
endif
5757

58-
build: $(REGISTRY_CMDS) $(OLM_CMDS) $(OPM) ## build opm and olm binaries
58+
build: $(REGISTRY_CMDS) $(OLM_CMDS) $(OPM) bin/copy-content ## build opm and olm binaries
5959

6060
build/opm:
6161
$(MAKE) $(OPM)
@@ -64,7 +64,7 @@ build/registry:
6464
$(MAKE) $(REGISTRY_CMDS) $(OPM)
6565

6666
build/olm:
67-
$(MAKE) $(PSM_CMD) $(OLM_CMDS) $(COLLECT_PROFILES_CMD)
67+
$(MAKE) $(PSM_CMD) $(OLM_CMDS) $(COLLECT_PROFILES_CMD) bin/copy-content
6868

6969
$(OPM): version_flags=-ldflags "-X '$(REGISTRY_PKG)/cmd/opm/version.gitCommit=$(GIT_COMMIT)' -X '$(REGISTRY_PKG)/cmd/opm/version.opmVersion=$(OPM_VERSION)' -X '$(REGISTRY_PKG)/cmd/opm/version.buildDate=$(BUILD_DATE)'"
7070
$(OPM):
@@ -104,6 +104,9 @@ bin/kubebuilder:
104104
bin/cpb: FORCE
105105
CGO_ENABLED=0 go build $(GO_BUILD_OPTS) -ldflags '-extldflags "-static"' -o $@ github.com/operator-framework/operator-lifecycle-manager/util/cpb
106106

107+
bin/copy-content: FORCE
108+
CGO_ENABLED=0 go build $(GO_BUILD_OPTS) -ldflags '-extldflags "-static"' -o $@ github.com/operator-framework/operator-lifecycle-manager/cmd/copy-content
109+
107110
unit/olm: bin/kubebuilder
108111
@echo "Running the OLM unit tests"
109112
$(MAKE) unit WHAT=operator-lifecycle-manager

‎cmds.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package cmds
22

33
import (
44
_ "github.com/operator-framework/operator-lifecycle-manager/cmd/catalog"
5+
_ "github.com/operator-framework/operator-lifecycle-manager/cmd/copy-content"
56
_ "github.com/operator-framework/operator-lifecycle-manager/cmd/olm"
67
_ "github.com/operator-framework/operator-lifecycle-manager/cmd/package-server"
78
_ "github.com/operator-framework/operator-lifecycle-manager/util/cpb"

‎go.mod

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ require (
1313
github.com/mikefarah/yq/v3 v3.0.0-20201202084205-8846255d1c37
1414
github.com/onsi/ginkgo/v2 v2.9.5
1515
github.com/openshift/api v3.9.0+incompatible
16-
github.com/operator-framework/api v0.17.8-0.20230803152844-704ae942c4a9
16+
github.com/operator-framework/api v0.17.8-0.20230908201838-28c6773d2b74
1717
github.com/operator-framework/operator-lifecycle-manager v0.0.0-00010101000000-000000000000
18-
github.com/operator-framework/operator-registry v1.27.1
18+
github.com/operator-framework/operator-registry v1.29.0
1919
github.com/sirupsen/logrus v1.9.2
2020
github.com/spf13/cobra v1.7.0
2121
github.com/stretchr/testify v1.8.3
@@ -63,7 +63,7 @@ require (
6363
github.com/coreos/go-semver v0.3.0 // indirect
6464
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
6565
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
66-
github.com/cyphar/filepath-securejoin v0.2.3 // indirect
66+
github.com/cyphar/filepath-securejoin v0.2.4 // indirect
6767
github.com/davecgh/go-spew v1.1.1 // indirect
6868
github.com/distribution/distribution v2.7.1+incompatible // indirect
6969
github.com/docker/cli v23.0.1+incompatible // indirect
@@ -73,7 +73,7 @@ require (
7373
github.com/docker/go-connections v0.4.0 // indirect
7474
github.com/docker/go-metrics v0.0.1 // indirect
7575
github.com/docker/go-units v0.5.0 // indirect
76-
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
76+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
7777
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
7878
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
7979
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
@@ -162,7 +162,7 @@ require (
162162
github.com/opencontainers/go-digest v1.0.0 // indirect
163163
github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b // indirect
164164
github.com/openshift/client-go v0.0.0-20220525160904-9e1acff93e4a // indirect
165-
github.com/otiai10/copy v1.2.0 // indirect
165+
github.com/otiai10/copy v1.12.0 // indirect
166166
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 // indirect
167167
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
168168
github.com/pkg/errors v0.9.1 // indirect

‎go.sum

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -167,8 +167,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHH
167167
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
168168
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
169169
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
170-
github.com/cyphar/filepath-securejoin v0.2.3 h1:YX6ebbZCZP7VkM3scTTokDgBL2TY741X51MTk3ycuNI=
171-
github.com/cyphar/filepath-securejoin v0.2.3/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
170+
github.com/cyphar/filepath-securejoin v0.2.4 h1:Ugdm7cg7i6ZK6x3xDF1oEu1nfkyfH53EtKeQYTC3kyg=
171+
github.com/cyphar/filepath-securejoin v0.2.4/go.mod h1:aPGpWjXOXUn2NCNjFvBE6aRxGGx79pTxQpKOJNYHHl4=
172172
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
173173
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
174174
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -205,8 +205,8 @@ github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4
205205
github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc=
206206
github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
207207
github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
208-
github.com/emicklei/go-restful/v3 v3.10.1 h1:rc42Y5YTp7Am7CS630D7JmhRjq4UlEUuEKfrDac4bSQ=
209-
github.com/emicklei/go-restful/v3 v3.10.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
208+
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
209+
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
210210
github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o=
211211
github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
212212
github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
@@ -700,13 +700,9 @@ github.com/openshift/api v0.0.0-20210517065120-b325f58df679/go.mod h1:dZ4kytOo3s
700700
github.com/openshift/build-machinery-go v0.0.0-20210209125900-0da259a2c359/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
701701
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0 h1:kMiuiZXH1GdfbiMwsuAQOqGaMxlo9NCUk0wT4XAdfNM=
702702
github.com/openshift/client-go v0.0.0-20200326155132-2a6cd50aedd0/go.mod h1:uUQ4LClRO+fg5MF/P6QxjMCb1C9f7Oh4RKepftDnEJE=
703-
github.com/otiai10/copy v1.2.0 h1:HvG945u96iNadPoG2/Ja2+AUJeW5YuFQMixq9yirC+k=
704-
github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
705-
github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE=
706-
github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs=
707-
github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
708-
github.com/otiai10/mint v1.3.1 h1:BCmzIS3n71sGfHB5NMNDB3lHYPz8fWSkCAErHed//qc=
709-
github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
703+
github.com/otiai10/copy v1.12.0 h1:cLMgSQnXBs1eehF0Wy/FAGsgDTDmAqFR7rQylBb1nDY=
704+
github.com/otiai10/copy v1.12.0/go.mod h1:rSaLseMUsZFFbsFGc7wCJnnkTAvdc5L6VWxPE4308Ww=
705+
github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
710706
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
711707
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9 h1:4lfz0keanz7/gAlvJ7lAe9zmE08HXxifBZJC0AdeGKo=
712708
github.com/pbnjay/strptime v0.0.0-20140226051138-5c05b0d668c9/go.mod h1:6Hr+C/olSdkdL3z68MlyXWzwhvwmwN7KuUFXGb3PoOk=

‎manifests/0000_50_olm_00-catalogsources.crd.yaml

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -534,8 +534,21 @@ spec:
534534
topologyKey:
535535
description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
536536
type: string
537+
extractContent:
538+
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.
539+
type: object
540+
required:
541+
- cacheDir
542+
- catalogDir
543+
properties:
544+
cacheDir:
545+
description: CacheDir is the directory storing the pre-calculated API cache.
546+
type: string
547+
catalogDir:
548+
description: CatalogDir is the directory storing the file-based catalog contents.
549+
type: string
537550
memoryTarget:
538-
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 - the memory limit will be set to 200% of 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."
551+
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."
539552
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
540553
anyOf:
541554
- type: integer

‎manifests/0000_90_olm_01-prometheus-rule.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ spec:
3636
- name: olm.installplan.rules
3737
rules:
3838
- alert: InstallPlanStepAppliedWithWarnings
39-
expr: sum(increase(installplan_warnings_total[5m])) > 0
39+
expr: sum by(namespace) (increase(installplan_warnings_total[5m])) > 0
4040
labels:
4141
severity: warning
4242
annotations:

‎operator-lifecycle-manager.Dockerfile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ ENV GO111MODULE auto
44
ENV GOPATH /go
55
ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
66

7-
# Permit the cpb binary to be compiled statically. The Red Hat compiler
7+
# Permit the cpb and copy-content binaries to be compiled statically. The Red Hat compiler
88
# provided by ART will otherwise force FIPS compliant dynamic compilation.
9-
ENV GO_COMPLIANCE_EXCLUDE="build.*operator-lifecycle-manager/util/cpb"
9+
ENV GO_COMPLIANCE_EXCLUDE="build.*operator-lifecycle-manager/(util/cpb|cmd/copy-content)"
1010

1111
WORKDIR /build
1212

@@ -30,6 +30,7 @@ COPY --from=builder /build/bin/collect-profiles /bin/collect-profiles
3030
COPY --from=builder /build/bin/package-server /bin/package-server
3131
COPY --from=builder /build/bin/cpb /bin/cpb
3232
COPY --from=builder /build/bin/psm /bin/psm
33+
COPY --from=builder /build/bin/copy-content /bin/copy-content
3334

3435
# This image doesn't need to run as root user.
3536
USER 1001

‎scripts/bumper/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func main() {
199199
}
200200
for i, commit := range missingCommits {
201201
commitLogger := logger.WithField("commit", commit.Hash)
202-
commitLogger.Infof("cherry-picking commit %d/%d", i+1, len(commits))
202+
commitLogger.Infof("cherry-picking commit %d/%d", i+1, len(missingCommits))
203203
if err := cherryPick(ctx, commitLogger, commit, opts.GitCommitArgs()); err != nil {
204204
logger.WithError(err).Fatal("failed to cherry-pick commit")
205205
}

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,8 +532,21 @@ spec:
532532
topologyKey:
533533
description: This pod should be co-located (affinity) or not co-located (anti-affinity) with the pods matching the labelSelector in the specified namespaces, where co-located is defined as running on a node whose value of the label with key topologyKey matches that of any node on which any of the selected pods is running. Empty topologyKey is not allowed.
534534
type: string
535+
extractContent:
536+
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.
537+
type: object
538+
required:
539+
- cacheDir
540+
- catalogDir
541+
properties:
542+
cacheDir:
543+
description: CacheDir is the directory storing the pre-calculated API cache.
544+
type: string
545+
catalogDir:
546+
description: CatalogDir is the directory storing the file-based catalog contents.
547+
type: string
535548
memoryTarget:
536-
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 - the memory limit will be set to 200% of 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."
549+
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."
537550
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
538551
anyOf:
539552
- type: integer

‎staging/api/crds/zz_defs.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎staging/api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/cenkalti/backoff/v4 v4.1.3 // indirect
2626
github.com/cespare/xxhash/v2 v2.2.0 // indirect
2727
github.com/davecgh/go-spew v1.1.1 // indirect
28-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
28+
github.com/emicklei/go-restful/v3 v3.10.2 // indirect
2929
github.com/felixge/httpsnoop v1.0.3 // indirect
3030
github.com/go-logr/logr v1.2.4 // indirect
3131
github.com/go-logr/stdr v1.2.2 // indirect

‎staging/api/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
6767
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
6868
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
6969
github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
70-
github.com/emicklei/go-restful/v3 v3.9.0 h1:XwGDlfxEnQZzuopoqxwSEllNcCOM9DhhFyhFIIGKwxE=
71-
github.com/emicklei/go-restful/v3 v3.9.0/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
70+
github.com/emicklei/go-restful/v3 v3.10.2 h1:hIovbnmBTLjHXkqEBUz3HGpXZdM7ZrE9fJIZIqlJLqE=
71+
github.com/emicklei/go-restful/v3 v3.10.2/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
7272
github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
7373
github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
7474
github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=

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

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,29 @@ type GrpcPodConfig struct {
152152
// will have the following modifications made to the container running the server:
153153
// - the $GOMEMLIMIT environment variable will be set to this value in bytes
154154
// - the memory request will be set to this value
155-
// - the memory limit will be set to 200% of this value
156155
//
157156
// This field should be set if it's desired to reduce the footprint of a catalog server as much as possible, or if
158157
// a catalog being served is very large and needs more than the default allocation. If your index image has a file-
159158
// system cache, determine a good approximation for this value by doubling the size of the package cache at
160159
// /tmp/cache/cache/packages.json in the index image.
161160
//
162161
// This field is best-effort; if unset, no default will be used and no Pod memory limit or $GOMEMLIMIT value will be set.
162+
// +optional
163163
MemoryTarget *resource.Quantity `json:"memoryTarget,omitempty"`
164+
165+
// ExtractContent configures the gRPC catalog Pod to extract catalog metadata from the provided index image and
166+
// use a well-known version of the `opm` server to expose it. The catalog index image that this CatalogSource is
167+
// configured to use *must* be using the file-based catalogs in order to utilize this feature.
168+
// +optional
169+
ExtractContent *ExtractContentConfig `json:"extractContent,omitempty"`
170+
}
171+
172+
// ExtractContentConfig configures context extraction from a file-based catalog index image.
173+
type ExtractContentConfig struct {
174+
// CacheDir is the directory storing the pre-calculated API cache.
175+
CacheDir string `json:"cacheDir"`
176+
// CatalogDir is the directory storing the file-based catalog contents.
177+
CatalogDir string `json:"catalogDir"`
164178
}
165179

166180
// UpdateStrategy holds all the different types of catalog source update strategies

0 commit comments

Comments
 (0)