If the old common-templates CRD exists, the operator receives an empt…

…y response by querying from by its kind (no resources found), and this leads it to wrongfully think it should take the upgrade path. This PR makes sure to perform an upgrade when the old CR exists, instead of the old CRD. Signed-off-by: Omer Yahud <[email protected]>
kubevirt · Jun 29, 2020 · d1ee4aa · d1ee4aa
1 parent 416e4fb
commit d1ee4aa
Showing 1 changed file with 16 additions and 7 deletions.
diff --git a/roles/KubevirtCommonTemplatesBundle/tasks/main.yml b/roles/KubevirtCommonTemplatesBundle/tasks/main.yml
@@ -24,15 +24,24 @@
   set_fact:
     templates: "{{ lookup('k8s', api_version=ct_status.results[0].result.apiVersion, kind='template') }}"
 
-- name: Fetch old cr
-  block:
-  - set_fact:
+- block:
+  - name: Fetch old CR
+    set_fact:
       old_cr: "{{ lookup('k8s', api_version='kubevirt.io/v1', kind='KubevirtCommonTemplatesBundle') }}"
-  - set_fact:
-      old_cr_exists: true
   rescue:
-  - set_fact:
-      old_cr_exists: false
+  - name: Fail if k8s lookup plugin errored
+    fail:
+      msg: "An error occured while fetching the old CR: {{ ansible_failed_result.msg }}"
+    when:
+    # This is the error that is raised when a resource is not found
+    # see: https://github.com/ansible-collections/community.kubernetes/blob/9fb808c7f37caea0300db1b466117ad0367db492/plugins/module_utils/common.py#L230
+    # this means there is no old CR to take ownership from
+    - '"Failed to find exact match" not in ansible_failed_result.msg'
+
+# If the old cr exists, it would have a metadata field
+- name: Check if the old CR exists
+  set_fact:
+    old_cr_exists: "{{ true if (old_cr is defined) and (old_cr.metadata | default(None)) != None else false }}"
 
 - name: Filter for templates owned by the old cr
   set_fact: