Merge pull request #201 from omeryahud/backport-b698dacd0d29-patch-resources-instead-of-apply

[Backport] Patch resources instead of apply

Author: omeryahud

roles/ClaimOwnership/tasks/main.yml

@@ -5,7 +5,7 @@
     state: present
     resource_definition:
       apiVersion: "{{ object.apiVersion }}"
-      kind: "{{ object.kind }}"
+      kind: "{{ objectKind | default(object.kind) }}"
       metadata:
         name: "{{ object.metadata.name }}"
         namespace: "{{ object.metadata.namespace }}"

roles/KubevirtCommonTemplatesBundle/tasks/main.yml

@@ -15,14 +15,14 @@
     state: present
     namespace: "{{ cr_info.metadata.namespace }}"
     definition: "{{ item | from_yaml }}"
-    apply: yes
+    merge_type: ['merge', 'json']
   with_items: "{{ lookup('file', 'common-templates-'+ version +'.yaml').split('\n---\n') | select('search', '(^|\n)[^#]') | list }}"
   register: ct_status
 
 # Get all templates
 - name: Fetching all templates
   set_fact:
-    templates: "{{ lookup('k8s', api_version=ct_status.results[0].result.apiVersion, kind='template') }}"
+    templates: "{{ lookup('k8s', api_version=ct_status.results[0].result.apiVersion, kind='templates') }}"
 
 - block:
   - name: Fetch old CR
@@ -54,6 +54,7 @@
     name: ClaimOwnership
   vars:
     object: "{{ item }}"
+    objectKind: "templates"
     owner: "{{ cr_info }}"
   when: "{{ old_cr_exists==true }}"
   with_items: "{{ old_cr_templates }}" # Templates

roles/KubevirtMetricsAggregation/tasks/main.yml

@@ -15,7 +15,7 @@
     state: present
     namespace: "{{ meta.namespace }}"
     definition: "{{ item | from_yaml }}"
-    apply: yes
+    merge_type: ['merge', 'json']
   with_items: "{{ lookup('template', 'aggregation-rule-vmi-count.yaml.j2').split('\n---\n') | select('search', '(^|\n)[^#]') |list }}"
   register: promrules
 

roles/KubevirtNodeLabeller/tasks/main.yml

@@ -13,15 +13,15 @@
   k8s:
     state: present
     definition: "{{ item | from_yaml }}"
-    apply: yes
+    merge_type: ['merge', 'json']
   with_items: "{{ lookup('template', 'kubevirt-node-labeller-roles.yaml.j2').split('\n---\n') | select('search', '(^|\n)[^#]') | list }}"
   register: roles
 
 - name: Create the node labeller daemon set
   k8s:
     state: present
     definition: "{{ lookup('template', 'kubevirt-node-labeller-ds.yaml.j2') | from_yaml }}"
-    apply: yes
+    merge_type: ['merge', 'json']
   register: nl
 
 # Actively inject owner references in order to adopt existing resources during an upgrade

roles/KubevirtTemplateValidator/tasks/main.yml

@@ -14,12 +14,12 @@
   k8s:
     state: present
     definition: "{{ lookup('template', 'template-view-role.yaml.j2') | from_yaml }}"
-    apply: yes
+    merge_type: ['merge', 'json']
 - name: Create the service
   k8s:
     state: present
     definition: "{{ item | from_yaml }}"
-    apply: yes
+    merge_type: ['merge', 'json']
   with_items: "{{ lookup('template', 'service.yaml.j2').split('\n---\n') | select('search', '(^|\n)[^#]') | list }}"
   register: tv
 
@@ -39,7 +39,7 @@
   k8s:
     state: present
     definition: "{{ lookup('template', 'webhook.yaml.j2') | from_yaml }}"
-    apply: yes
+    merge_type: ['merge', 'json']
 
 - name: Refresh template-validator var
   set_fact: