Skip to content

Commit 269128e

Browse files
committed
1 parent 7dc6b2e commit 269128e

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

Makefile

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -323,8 +323,11 @@ build: test envtest manager docker-build ## Build Operator image
323323

324324

325325
.PHONY: bundle
326-
bundle: manifests install-operator-sdk ## Generate bundle manifests and metadata
326+
bundle: manifests install-operator-sdk install-yq ## Generate bundle manifests and metadata
327327
$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(PACKAGE_VERSION) $(BUNDLE_METADATA_OPTS)
328+
# Workaround for https://github.com/operator-framework/operator-lifecycle-manager/issues/1608
329+
# See https://github.com/operator-framework/operator-lifecycle-manager/issues/952#issuecomment-639657949
330+
$(YQ) e ".spec.install.spec.deployments[0].name = .spec.install.spec.deployments[0].name + \"-v$(OPERATOR_VERSION)\"" -i "bundle/manifests/apicurio-registry-operator.clusterserviceversion.yaml"
328331
$(OPERATOR_SDK) bundle validate ./bundle
329332

330333

@@ -343,8 +346,11 @@ endif
343346

344347

345348
.PHONY: packagemanifests
346-
packagemanifests: manifests install-operator-sdk ## Generate package manifests
349+
packagemanifests: manifests install-operator-sdk install-yq ## Generate package manifests
347350
$(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate packagemanifests -q --version $(PACKAGE_VERSION) $(PACKAGE_MANIFESTS_OPTS)
351+
# Workaround for https://github.com/operator-framework/operator-lifecycle-manager/issues/1608
352+
# See https://github.com/operator-framework/operator-lifecycle-manager/issues/952#issuecomment-639657949
353+
$(YQ) e ".spec.install.spec.deployments[0].name = .spec.install.spec.deployments[0].name + \"-v$(OPERATOR_VERSION)\"" -i "packagemanifests/$(PACKAGE_VERSION)/apicurio-registry-operator.clusterserviceversion.yaml"
348354

349355

350356
.PHONY: docs

0 commit comments

Comments
 (0)