diff --git a/Makefile b/Makefile index 6e2dbac34..765ca9086 100644 --- a/Makefile +++ b/Makefile @@ -412,7 +412,6 @@ bundle: $(OPM) $(YQ) manifests kustomize operator-sdk ## Generate bundle manifes V="kuadrant-operator.v$(BUNDLE_VERSION)" $(YQ) eval '.metadata.name = strenv(V)' -i config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml V="$(BUNDLE_VERSION)" $(YQ) eval '.spec.version = strenv(V)' -i config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml V="$(IMG)" $(YQ) eval '.metadata.annotations.containerImage = strenv(V)' -i config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml - V="kuadrant-operator.v$(REPLACES_VERSION)" $(YQ) eval '.spec.replaces = strenv(V)' -i config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml # Generate bundle $(KUSTOMIZE) build config/manifests | $(OPERATOR_SDK) generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS) # Update operator dependencies diff --git a/config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml b/config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml index 2d5eba664..807ae1724 100644 --- a/config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/kuadrant-operator.clusterserviceversion.yaml @@ -76,5 +76,4 @@ spec: provider: name: Red Hat url: https://github.com/Kuadrant/kuadrant-operator - replaces: kuadrant-operator.v0.3.1 version: 0.4.0 diff --git a/utils/generate-catalog.sh b/utils/generate-catalog.sh index b8da4fb4f..1038a74bd 100755 --- a/utils/generate-catalog.sh +++ b/utils/generate-catalog.sh @@ -84,6 +84,6 @@ cat ${TMP_DIR}/kuadrant-operator-bundle.yaml >> ${CATALOG_FILE} NAME=`${YQ} eval '.name' ${TMP_DIR}/kuadrant-operator-bundle.yaml` \ REPLACES=kuadrant-operator.v${REPLACES_VERSION} \ CHANNELS=${CHANNELS} \ - ${YQ} eval '(.entries[0].name = strenv(NAME)) | (.entries[0].replaces = strenv(REPLACES)) | (.name = strenv(CHANNELS))' ${CATALOG_BASEDIR}/kuadrant-operator-channel-entry.yaml >> ${CATALOG_FILE} + ${YQ} eval '(.entries[0].name = strenv(NAME)) | (.name = strenv(CHANNELS))' ${CATALOG_BASEDIR}/kuadrant-operator-channel-entry.yaml >> ${CATALOG_FILE} rm -rf $TMP_DIR