Split metrics utility cronjobs for crc and local report (#1906)

* fixing metrics-utility variables and conditionals

* separating metrics-utility for console into separate tasks and conditionals

roles/installer/tasks/enable_metrics_utility.yml

@@ -28,15 +28,3 @@
   loop:
     - {name: 'metrics-utility-gather', template: 'cronjobs/metrics-utility-gather.yaml.j2'}
     - {name: 'metrics-utility-report', template: 'cronjobs/metrics-utility-report.yaml.j2'}
-
-- name: Create metrics-utility Kubernetes CronJob for Red Hat Hybrid Cloud Console
-  kubernetes.core.k8s:
-    definition: "{{ lookup('template', item.template) }}"
-    apply: true
-    wait: true
-  vars:
-    cronjob_name: "{{ item.name }}"
-    metrics_utility_ship_target: crc  # TODO - Update to console when changed
-  loop:
-    - {name: 'metrics-utility-gather-console', template: 'cronjobs/metrics-utility-gather.yaml.j2'}
-  when: _metrics_utility_console_enabled

roles/installer/tasks/enable_metrics_utility_console.yml

@@ -0,0 +1,11 @@
+---
+- name: Create metrics-utility Kubernetes CronJob for Red Hat Hybrid Cloud Console
+  kubernetes.core.k8s:
+    definition: "{{ lookup('template', item.template) }}"
+    apply: true
+    wait: true
+  vars:
+    cronjob_name: "{{ item.name }}"
+    metrics_utility_ship_target: crc  # TODO - Update to console when changed
+  loop:
+    - {name: 'metrics-utility-gather-console', template: 'cronjobs/metrics-utility-gather.yaml.j2'}

roles/installer/tasks/install.yml

@@ -104,7 +104,11 @@
 
 - name: Enable optional metrics-utility
   include_tasks: enable_metrics_utility.yml
-  when: metrics_utility_enabled | bool
+  when: _metrics_utility_enabled | bool
+
+- name: Enable optional metrics-utility for Redhat Console
+  include_tasks: enable_metrics_utility_console.yml
+  when: _metrics_utility_console_enabled | bool
 
 - name: Update status variables
   include_tasks: update_status.yml

roles/installer/templates/cronjobs/metrics-utility-gather.yaml.j2

@@ -52,9 +52,11 @@ spec:
                 name: {{ metrics_utility_secret }}
 {% endif %}
             volumeMounts:
+{% if _metrics_utility_ship_target == "directory" %}
             - name: {{ ansible_operator_meta.name }}-metrics-utility
               mountPath: /metrics-utility
               readOnly: false
+{% endif %}
             - name: "{{ ansible_operator_meta.name }}-application-credentials"
               mountPath: "/etc/tower/conf.d/credentials.py"
               subPath: credentials.py
@@ -69,10 +71,12 @@ spec:
               readOnly: true
             {{ lookup("template", "common/volume_mounts/extra_settings_files.yaml.j2")  | indent(width=12) | trim }}
           volumes:
+{% if _metrics_utility_ship_target == "directory" %}
           - name: {{ ansible_operator_meta.name }}-metrics-utility
             persistentVolumeClaim:
               claimName: {{ _metrics_utility_pvc_claim }}
               readOnly: false
+{% endif %}
           - name: "{{ ansible_operator_meta.name }}-application-credentials"
             secret:
               secretName: "{{ ansible_operator_meta.name }}-app-credentials"