Skip to content

Commit

Permalink
Merge pull request #11469 from vrutkovs/3.11-olm-version
Browse files Browse the repository at this point in the history
OLM: use olm_operator_version as a tag for Origin images
  • Loading branch information
openshift-merge-robot authored Apr 5, 2019
2 parents 3faa8bb + ce018f8 commit 8a57696
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions roles/olm/defaults/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
operator_lifecycle_manager_remove: false
operator_lifecycle_manager_install: true

olm_operator_version: "0.7.1"

olm_image_dict:
origin: 'quay.io/coreos/olm'
origin: 'quay.io/coreos/olm:{{ olm_operator_version }}'
openshift-enterprise: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'operator-lifecycle-manager') }}"
catalog_image_dict:
origin: 'quay.io/coreos/catalog'
origin: 'quay.io/coreos/catalog:{{ olm_operator_version }}'
openshift-enterprise: "{{ l_osm_registry_url | regex_replace('${component}' | regex_escape, 'operator-lifecycle-manager') }}"

olm_operator_image: "{{ olm_image_dict[openshift_deployment_type] }}"
Expand Down

0 comments on commit 8a57696

Please sign in to comment.