Skip to content

Commit 892ffec

Browse files
holserrebtoor
authored andcommitted
[kustomize_deploy] Install CatalogSource before Subscription
Move CatalogSource creation task to run before applying OLM Subscriptions to ensure custom catalog is available when the Subscription is created. Signed-off-by: Sergii Golovatiuk <sgolovat@redhat.com>
1 parent a1c87a9 commit 892ffec

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

roles/kustomize_deploy/tasks/install_operators.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,14 @@
8585
- name: OLM resources
8686
when: not cifmw_kustomize_deploy_generate_crs_only
8787
block:
88+
- name: Create catalog source and switch dependent operators to consume it
89+
when:
90+
- cifmw_openshift_setup_enable_operator_catalog_override |
91+
default(false) | bool
92+
ansible.builtin.import_role:
93+
name: openshift_setup
94+
tasks_from: patch_dependent_operators_source.yml
95+
8896
- name: Apply the kustomized CRs
8997
kubernetes.core.k8s:
9098
kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
@@ -157,7 +165,6 @@
157165
_cifmw_kustomize_deploy_olm_osp_operator_install_plan_out.resources | first
158166
).status.phase | lower == "complete"
159167
160-
161168
- name: Wait for cert-manager-operator pods
162169
kubernetes.core.k8s_info:
163170
kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
@@ -226,14 +233,6 @@
226233
register: _certmanager_pods
227234
until: _certmanager_pods is success
228235

229-
- name: Create catalog source and switch dependent operators to consume it
230-
when:
231-
- cifmw_openshift_setup_enable_operator_catalog_override |
232-
default(false) | bool
233-
ansible.builtin.import_role:
234-
name: openshift_setup
235-
tasks_from: patch_dependent_operators_source.yml
236-
237236
- name: Wait for controller-manager deployment
238237
kubernetes.core.k8s_info:
239238
kubeconfig: "{{ cifmw_openshift_kubeconfig }}"

0 commit comments

Comments
 (0)