Skip to content

Commit

Permalink
Merge pull request #66 from jeremyary/main
Browse files Browse the repository at this point in the history
merge `alpha` to bring `0.1.3` & `OCP 4.9+` changes into both branches
  • Loading branch information
jeremyary authored Oct 20, 2021
2 parents b42c100 + 60553ca commit 7dff108
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ VERSION ?= 0.1.3
# need to uncomment & add the old bundles - the existing "from-index" catalog already has those.
#
# If you are developing and pushing against your OWN quay for testing, you likely need to uncomment
#OLD_BUNDLE_VERSIONS ?= 0.1.0,0.1.1
#OLD_BUNDLE_VERSIONS ?= 0.1.0,0.1.1,0.1.2

# CATALOG_VERSION defines the version of the index image.
CATALOG_VERSION ?= 0.1
Expand Down
2 changes: 1 addition & 1 deletion bundle.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM scratch

# RH OLM annotations
LABEL com.redhat.openshift.versions="v4.8"
LABEL com.redhat.openshift.versions="v4.9"
LABEL com.redhat.delivery.operator.bundle=true

# Core bundle labels.
Expand Down
2 changes: 1 addition & 1 deletion bundle/metadata/annotations.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
annotations:
# RH OLM annotations
com.redhat.openshift.versions: v4.8
com.redhat.openshift.versions: v4.9
com.redhat.delivery.operator.bundle: true

# Core bundle annotations.
Expand Down

0 comments on commit 7dff108

Please sign in to comment.