Skip to content

Commit

Permalink
Merge pull request #201 from jboss-fuse/claudio4j-patch-1
Browse files Browse the repository at this point in the history
Fix make bundle to get the ocp version
  • Loading branch information
claudio4j authored Jan 8, 2025
2 parents 55434f0 + cd9e420 commit e2c0a47
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions script/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ ifneq ($(origin PACKAGE), undefined)
BUNDLE_PACKAGE := --package=$(PACKAGE)
endif
BUNDLE_METADATA_OPTS ?= $(BUNDLE_CHANNELS) $(BUNDLE_DEFAULT_CHANNEL) $(BUNDLE_PACKAGE)
BUNDLE_METADATA_OPENSHIFT_VERSION ?= $(shell grep com.redhat.openshift.versions script/post_bundle_gen.sh |awk -F= '{print $2}'|sed 's/"//g')
BUNDLE_METADATA_OPENSHIFT_VERSION ?= $(shell grep com.redhat.openshift.versions script/post_bundle_gen.sh |awk -F= '{print $$2}'|sed 's/"//g')

#
# Tailor the manifest according to default values for this project
Expand Down Expand Up @@ -569,7 +569,7 @@ else
endif
@# Adds the licence headers to the csv file
./script/add_license.sh bundle/manifests ./script/headers/yaml.txt
@echo " com.redhat.openshift.versions : $(BUNDLE_METADATA_OPENSHIFT_VERSION)" >> ./bundle/metadata/annotations.yaml
@echo " com.redhat.openshift.versions: $(BUNDLE_METADATA_OPENSHIFT_VERSION)" >> ./bundle/metadata/annotations.yaml
$(OPERATOR_SDK) bundle validate ./bundle
# operator-sdk requires the name of the operator to be the PACKAGE
# However, the historical name of the operator has the suffix 'operator' so this should
Expand Down

0 comments on commit e2c0a47

Please sign in to comment.