Merge pull request #9931 from brancz/cluster-mon-optional-storage

cluster-monitoring: Make PVCs optional

roles/openshift_cluster_monitoring_operator/defaults/main.yml

@@ -43,7 +43,9 @@ openshift_cluster_monitoring_operator_kube_state_metrics_image: "{{l_openshift_c
 openshift_cluster_monitoring_operator_kube_rbac_proxy_image: "{{l_openshift_cluster_monitoring_image_dicts[openshift_deployment_type]['kube_rbac_proxy']}}"
 openshift_cluster_monitoring_operator_proxy_image: "{{l_openshift_cluster_monitoring_image_dicts[openshift_deployment_type]['oauth_proxy']}}"
 
+openshift_cluster_monitoring_operator_prometheus_storage_enabled: true
 openshift_cluster_monitoring_operator_prometheus_storage_capacity: "50Gi"
+openshift_cluster_monitoring_operator_alertmanager_storage_enabled: true
 openshift_cluster_monitoring_operator_alertmanager_storage_capacity: "2Gi"
 
 openshift_cluster_monitoring_operator_cluster_id: "{{ openshift_clusterid | default(openshift_master_cluster_public_hostname, true) | default(openshift_master_cluster_hostname, true) | default('openshift', true) }}"

roles/openshift_cluster_monitoring_operator/templates/cluster-monitoring-operator-config.j2

@@ -25,11 +25,13 @@ data:
 {% endif %}
       externalLabels:
         cluster: {{ openshift_cluster_monitoring_operator_cluster_id }}
+{% if openshift_cluster_monitoring_operator_prometheus_storage_enabled %}
       volumeClaimTemplate:
         spec:
           resources:
             requests:
               storage: {{ openshift_cluster_monitoring_operator_prometheus_storage_capacity }}
+{% endif %}
     alertmanagerMain:
       baseImage: {{ openshift_cluster_monitoring_operator_alertmanager_repo }}
 {% if openshift_cluster_monitoring_operator_node_selector is iterable and openshift_cluster_monitoring_operator_node_selector | length > 0 %}
@@ -38,11 +40,13 @@ data:
         {{ key }}: "{{ value }}"
 {% endfor %}
 {% endif %}
+{% if openshift_cluster_monitoring_operator_alertmanager_storage_enabled %}
       volumeClaimTemplate:
         spec:
           resources:
             requests:
               storage: {{ openshift_cluster_monitoring_operator_alertmanager_storage_capacity }}
+{% endif %}
     nodeExporter:
       baseImage: {{ openshift_cluster_monitoring_operator_node_exporter_repo }}
     grafana: