Merge pull request #2022 from ks-ci-bot/cherry-pick-2021-to-release-3.3

[release-3.3] Adjust ks-istio-monitoring to ensure monitoring files are installed

roles/ks-istio/tasks/main.yaml

@@ -7,7 +7,6 @@
     - "istio"
     - "kiali"
     - "jaeger"
-    - "prometheus"
 
 - name: servicemesh | Unarchive istio files
   shell: >
@@ -81,16 +80,6 @@
 
 - import_tasks: kiali-install.yaml
 
-# create prometheus config by PodMonitor and SerivceMonitor CR
-# wait until PodMonitor kind created.
-- name: servicemesh | Creating prometheus config
-  shell: >
-    {{ bin_dir }}/kubectl apply -f {{ kubesphere_dir }}/servicemesh/prometheus/prometheus-operator.yaml
-  register: prom_result
-  failed_when: false
-  until: prom_result is succeeded
-  retries: 5
-  delay: 5
 
 - name: servicemesh | set servicemesh status enabled
   shell: >

roles/ks-monitor/tasks/ks-istio-monitoring.yaml

@@ -0,0 +1,11 @@
+---
+- name: Monitoring | Getting ks-istio monitoring installation files
+  copy:
+    src: "{{ item }}"
+    dest: "{{ kubesphere_dir }}/"
+  loop:
+    - "ks-istio-monitoring"
+
+- name: Monitoring | Installing ks-istio monitoring
+  shell: >
+    {{ bin_dir }}/kubectl apply -f {{ kubesphere_dir }}/ks-istio-monitoring --force

roles/ks-monitor/tasks/main.yaml

@@ -6,6 +6,10 @@
   when:
     - "status.monitoring is not defined or status.monitoring.status is not defined or status.monitoring.status != 'enabled'"
 
+- import_tasks: ks-istio-monitoring.yaml
+  when:
+    - "servicemesh.enabled is defined and servicemesh.enabled"
+
 - import_tasks: gpu-monitoring.yaml
   when:
     - "status.monitoring is not defined or status.monitoring.status is not defined or status.monitoring.status != 'enabled'"