Merge pull request #7769 from mxinden/update-tpo

cluster_monitoring: Bump operator version and adjust related config

roles/openshift_cluster_monitoring_operator/defaults/main.yml

@@ -1,6 +1,6 @@
 ---
-openshift_cluster_monitoring_operator_image: quay.io/coreos/cluster-monitoring-operator:198d25d6
-openshift_cluster_monitoring_operator_prometheus_operator_repo: quay.io/coreos/prometheus-operator-dev
+openshift_cluster_monitoring_operator_image: quay.io/coreos/cluster-monitoring-operator:f0ca8a72
+openshift_cluster_monitoring_operator_prometheus_operator_repo: quay.io/coreos/prometheus-operator
 openshift_cluster_monitoring_operator_prometheus_repo: quay.io/prometheus/prometheus
 openshift_cluster_monitoring_operator_alertmanager_repo: quay.io/prometheus/alertmanager
 openshift_cluster_monitoring_operator_prometheus_reloader_repo: quay.io/coreos/prometheus-config-reloader

roles/openshift_cluster_monitoring_operator/files/cluster-monitoring-operator.yaml

@@ -13,9 +13,9 @@ metadata:
 openshift.io/provider-display-name: Red Hat, Inc.
 parameters:
 - name: OPERATOR_IMAGE
-  value: quay.io/coreos/cluster-monitoring-operator:198d25d6
+  value: quay.io/coreos/cluster-monitoring-operator:f0ca8a72
 - name: PROMETHEUS_OPERATOR_IMAGE
-  value: quay.io/coreos/prometheus-operator-dev
+  value: quay.io/coreos/prometheus-operator
 - name: ALERTMANAGER_IMAGE
   value: quay.io/prometheus/alertmanager
 - name: PROMETHEUS_IMAGE
@@ -49,18 +49,16 @@ objects:
     name: cluster-monitoring-operator
     namespace: ${NAMESPACE}
     labels:
-      k8s-app: cluster-monitoring-operator
-      managed-by-channel-operator: "true"
+      app: cluster-monitoring-operator
   spec:
     replicas: 1
     selector:
       matchLabels:
-        k8s-app: cluster-monitoring-operator
+        app: cluster-monitoring-operator
     template:
       metadata:
         labels:
-          k8s-app: cluster-monitoring-operator
-          tectonic-app-version-name: tectonic-monitoring
+          app: cluster-monitoring-operator
       spec:
         containers:
         - image: ${OPERATOR_IMAGE}
@@ -77,5 +75,3 @@ objects:
             requests:
               cpu: 20m
               memory: 50Mi
-        restartPolicy: Always
-        terminationGracePeriodSeconds: 30