Adding bool filter to when openshift_logging_use_ops evals and updating oc_apply to handle trying to update immutable fields

1 files changed, 20 insertions, 0 deletions

diff --git a/roles/openshift_logging/tasks/oc_apply.yaml b/roles/openshift_logging/tasks/oc_apply.yaml
index c362b7fca..2dc0b0d74 100644
--- a/roles/openshift_logging/tasks/oc_apply.yaml
+++ b/roles/openshift_logging/tasks/oc_apply.yaml
@@ -18,6 +18,26 @@
   failed_when: "'error' in generation_apply.stderr"
   changed_when: no
 
+- name: Removing previous {{file_name}}
+  command: >
+    {{ openshift.common.client_binary }} --config={{ kubeconfig }}
+    delete -f {{ file_name }}
+    -n {{ namespace }}
+  register: generation_delete
+  failed_when: "'error' in generation_delete.stderr"
+  changed_when: no
+  when: "'field is immutable' in generation_apply.stderr"
+
+- name: Applying {{file_name}}
+  command: >
+    {{ openshift.common.client_binary }} --config={{ kubeconfig }}
+    apply -f {{ file_name }}
+    -n {{ namespace }}
+  register: generation_apply
+  failed_when: "'error' in generation_apply.stderr"
+  changed_when: no
+  when: "'field is immutable' in generation_apply.stderr"
+
 - name: Determine change status of {{file_content.kind}} {{file_content.metadata.name}}
   shell: >
     {{ openshift.common.client_binary }} --config={{ kubeconfig }}