Merge pull request #629 from jlarriba/empty_mysql_exporter

[OSPRH-14384] Upstream mysqld-exporter image will leak through to RHO…

Author: openshift-merge-bot[bot]

api/v1beta1/ceilometer_types.go

@@ -17,9 +17,9 @@ limitations under the License.
 package v1beta1
 
 import (
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
@@ -42,7 +42,8 @@ const (
 	// KubeStateMetricsImage - default fall-back image for KSM
 	KubeStateMetricsImage = "registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.10.0"
 	// MysqldExporterImage - default fall-back image for mysqld_exporter
-	MysqldExporterContainerImage = "quay.io/prometheus/mysqld-exporter:v0.16.0"
+	// MysqldExporterContainerImage = "quay.io/prometheus/mysqld-exporter:v0.16.0"
+	MysqldExporterContainerImage = ""
 )
 
 // CeilometerSpec defines the desired state of Ceilometer

tests/kuttl/suites/ceilometer/tests/00-assert.yaml

@@ -178,61 +178,3 @@ status:
   currentReplicas: 1
   readyReplicas: 1
   replicas: 1
----
-apiVersion: v1
-kind: Pod
-metadata:
-  labels:
-    service: mysqld-exporter
-  name: mysqld-exporter-0
-  ownerReferences:
-  - kind: StatefulSet
-    name: mysqld-exporter
-spec:
-  containers:
-  - name: mysqld-exporter
-  hostname: mysqld-exporter-0
-status:
-  containerStatuses:
-  - name: mysqld-exporter
-    ready: true
-    started: true
----
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  labels:
-    service: mysqld-exporter
-  name: mysqld-exporter
-  ownerReferences:
-  - kind: Ceilometer
-    name: telemetry-kuttl
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      service: mysqld-exporter
-  template:
-    spec:
-      containers:
-      - name: mysqld-exporter
-status:
-  availableReplicas: 1
-  currentReplicas: 1
-  readyReplicas: 1
-  replicas: 1
----
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    service: mysqld-exporter
-  name: mysqld-exporter
-  ownerReferences:
-  - kind: Ceilometer
-    name: telemetry-kuttl
-spec:
-  ports:
-  - port: 9104
-    protocol: TCP
-    targetPort: 9104

tests/kuttl/suites/ceilometer/tests/00-deploy.yaml

@@ -4,5 +4,5 @@ metadata:
   name: telemetry-kuttl
 spec:
   secret: osp-secret
-  mysqldExporterEnabled: true
+  mysqldExporterEnabled: false
   ksmEnabled: true

tests/kuttl/suites/metricstorage/tests/01-assert.yaml

@@ -95,36 +95,6 @@ metadata:
 spec:
   scrapeInterval: 30s
 ---
-apiVersion: monitoring.rhobs/v1alpha1
-kind: ScrapeConfig
-metadata:
-  labels:
-    service: metricStorage
-  name: telemetry-mysqld-exporter
-  ownerReferences:
-  - kind: MetricStorage
-    name: telemetry-kuttl
-spec:
-  metricsPath: /probe
-  relabelings:
-  - action: Replace
-    sourceLabels:
-    - __address__
-    targetLabel: __param_target
-  - action: Replace
-    regex: (.*):(.*)
-    replacement: client.$1
-    sourceLabels:
-    - __address__
-    targetLabel: __param_auth_module
-  - action: Replace
-    sourceLabels:
-    - __param_target
-    targetLabel: instance
-  - action: Replace
-    targetLabel: __address__
-  scrapeInterval: 30s
----
 apiVersion: observability.openshift.io/v1alpha1
 kind: UIPlugin
 metadata: