Skip to content

Commit

Permalink
OLM - Improve package manifest filtering
Browse files Browse the repository at this point in the history
The current code sometimes return an incorrect information when the same package is provided by multiple catalog source.
Using label_selector and field_selectors return the exact match

TestBos2: virt-prega
  • Loading branch information
betoredhat committed Jun 14, 2024
1 parent 9eaf75a commit 041543d
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions roles/olm_operator/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,25 @@
block:
- name: "Get operator's package manifests"
community.kubernetes.k8s_info:
api: packages.operators.coreos.com/v1
api_version: packages.operators.coreos.com/v1
kind: PackageManifest
namespace: default
name: "{{ operator }}"
label_selectors:
- catalog={{ source }}
- catalog-namespace={{ source_ns }}
field_selectors:
- metadata.name={{ operator }}
register: operator_packagemanifest
retries: 10
retries: 3
delay: 5
until:
- operator_packagemanifest is defined
- operator_packagemanifest.resources is defined
- operator_packagemanifest.resources | length
- operator_packagemanifest.resources[0].status is defined
- operator_packagemanifest.resources[0].status.catalogSource == source
failed_when: operator_packagemanifest is skipped
or operator_packagemanifest.resources is undefined
or operator_packagemanifest.resources | length != 1

- name: Create OperatorGroup for OLM operator # noqa: jinja[invalid]
- name: Create OperatorGroup for OLM operator
vars:
all_namespaces: "{{ operator_packagemanifest |
json_query('resources[*].status.channels[0].currentCSVDesc.installModes[3].supported') |
Expand Down

0 comments on commit 041543d

Please sign in to comment.