Merge pull request #640 from akrzos/decouple_cmc_from_lso

Decouple applying the cluster monitoring config from local storage co…

Author: openshift-merge-bot[bot]

ansible/roles/mno-post-cluster-install/defaults/main/main.yml

@@ -39,6 +39,10 @@ gitops_channel: stable
 migrate_ingresscontrollers: false
 migrate_monitoring: false
 
+# Apply the cluster-monitoring-config that uses the localstorage class name created either
+# by controlplane_localstorage_configuration or worker_localstorage_configuration
+apply_cluster_monitoring_config: false
+
 # Set the rention period for prometheus to allow up to 15 days of data by default
 prometheus_retention_period: 15d
 

ansible/roles/mno-post-cluster-install/tasks/main.yml

@@ -124,7 +124,7 @@
   block:
   - name: Label the control-plane nodes
     shell: |
-      KUBECONFIG={{ bastion_cluster_config_dir }}/kubeconfig oc label no --overwrite {{ item }} localstorage=true prometheus=true
+      KUBECONFIG={{ bastion_cluster_config_dir }}/kubeconfig oc label no --overwrite {{ item }} localstorage=true
     with_items: "{{ groups['controlplane'] }}"
 
   - name: Install local-storage operator
@@ -149,16 +149,12 @@
     delay: 2
     when: localvolume2_configuration
 
-  - name: Configure OpenShift-Monitoring Prometheus to use localstorage
-    shell:
-      KUBECONFIG={{ bastion_cluster_config_dir }}/kubeconfig oc apply -f {{ bastion_cluster_config_dir }}/openshift-monitoring/cluster-monitoring-config.yml
-
 - name: Setup worker nodes localstorage
   when: worker_localstorage_configuration
   block:
   - name: Label the worker nodes
     shell: |
-      KUBECONFIG={{ bastion_cluster_config_dir }}/kubeconfig oc label no --overwrite {{ item }} localstorage=true prometheus=true
+      KUBECONFIG={{ bastion_cluster_config_dir }}/kubeconfig oc label no --overwrite {{ item }} localstorage=true
     with_items: "{{ groups['worker'] }}"
 
   - name: Install local-storage operator
@@ -194,7 +190,7 @@
     KUBECONFIG={{ bastion_cluster_config_dir }}/kubeconfig oc patch ingresscontrollers/default --type merge -n openshift-ingress-operator -p '{"spec": {"nodePlacement": {"nodeSelector": {"matchLabels": {"node-role.kubernetes.io/master": "" }}, "tolerations": [{"effect": "NoSchedule", "key": "node-role.kubernetes.io/master"}]} }}'
 
 - name: Apply OpenShift-Monitoring configuration options
-  when: migrate_monitoring or worker_localstorage_configuration
+  when: migrate_monitoring or (apply_cluster_monitoring_config and (controlplane_localstorage_configuration or worker_localstorage_configuration))
   shell:
     KUBECONFIG={{ bastion_cluster_config_dir }}/kubeconfig oc apply -f {{ bastion_cluster_config_dir }}/openshift-monitoring/cluster-monitoring-config.yml
 

ansible/roles/mno-post-cluster-install/templates/cluster-monitoring-config.yml.j2

@@ -55,18 +55,7 @@ data:
       - effect: NoSchedule
         key: "node-role.kubernetes.io/master"
 {% else %}
-    prometheusOperator:
-      nodeSelector:
-        prometheus: "true"
-      tolerations:
-      - effect: NoSchedule
-        key: "node-role.kubernetes.io/master"
     prometheusK8s:
-      nodeSelector:
-        prometheus: "true"
-      tolerations:
-      - effect: NoSchedule
-        key: "node-role.kubernetes.io/master"
       retention: {{ prometheus_retention_period }}
       volumeClaimTemplate:
         metadata:
@@ -76,40 +65,4 @@ data:
           resources:
             requests:
               storage: 50Gi
-    alertmanagerMain:
-      nodeSelector:
-        prometheus: "true"
-      tolerations:
-      - effect: NoSchedule
-        key: "node-role.kubernetes.io/master"
-    kubeStateMetrics:
-      nodeSelector:
-        prometheus: "true"
-      tolerations:
-      - effect: NoSchedule
-        key: "node-role.kubernetes.io/master"
-    openshiftStateMetrics:
-      nodeSelector:
-        prometheus: "true"
-      tolerations:
-      - effect: NoSchedule
-        key: "node-role.kubernetes.io/master"
-    telemeterClient:
-      nodeSelector:
-        prometheus: "true"
-      tolerations:
-      - effect: NoSchedule
-        key: "node-role.kubernetes.io/master"
-    k8sPrometheusAdapter:
-      nodeSelector:
-        prometheus: "true"
-      tolerations:
-      - effect: NoSchedule
-        key: "node-role.kubernetes.io/master"
-    thanosQuerier:
-      nodeSelector:
-        prometheus: "true"
-      tolerations:
-      - effect: NoSchedule
-        key: "node-role.kubernetes.io/master"
 {% endif %}