Skip to content

Commit 75379ec

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1330 from jlarriba/revert_mysqld
Revert "Add mysqld exporter"
2 parents a3ed3f4 + 95acd2e commit 75379ec

12 files changed

+0
-79
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17470,8 +17470,6 @@ spec:
1747017470
type: string
1747117471
ceilometerIpmiImage:
1747217472
type: string
17473-
ceilometerMysqldExporterImage:
17474-
type: string
1747517473
ceilometerNotificationImage:
1747617474
type: string
1747717475
ceilometerProxyImage:

‎apis/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ spec:
6464
type: string
6565
ceilometerIpmiImage:
6666
type: string
67-
ceilometerMysqldExporterImage:
68-
type: string
6967
ceilometerNotificationImage:
7068
type: string
7169
ceilometerSgcoreImage:
@@ -283,8 +281,6 @@ spec:
283281
type: string
284282
ceilometerIpmiImage:
285283
type: string
286-
ceilometerMysqldExporterImage:
287-
type: string
288284
ceilometerNotificationImage:
289285
type: string
290286
ceilometerSgcoreImage:
@@ -467,8 +463,6 @@ spec:
467463
type: string
468464
ceilometerIpmiImage:
469465
type: string
470-
ceilometerMysqldExporterImage:
471-
type: string
472466
ceilometerNotificationImage:
473467
type: string
474468
ceilometerProxyImage:

‎apis/core/v1beta1/openstackversion_types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ type ContainerTemplate struct {
8989
CeilometerIpmiImage *string `json:"ceilometerIpmiImage,omitempty"`
9090
CeilometerNotificationImage *string `json:"ceilometerNotificationImage,omitempty"`
9191
CeilometerSgcoreImage *string `json:"ceilometerSgcoreImage,omitempty"`
92-
CeilometerMysqldExporterImage *string `json:"ceilometerMysqldExporterImage,omitempty"`
9392
CinderAPIImage *string `json:"cinderAPIImage,omitempty"`
9493
CinderBackupImage *string `json:"cinderBackupImage,omitempty"`
9594
CinderSchedulerImage *string `json:"cinderSchedulerImage,omitempty"`

‎apis/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 0 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bindata/crds/crds.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17634,8 +17634,6 @@ spec:
1763417634
type: string
1763517635
ceilometerIpmiImage:
1763617636
type: string
17637-
ceilometerMysqldExporterImage:
17638-
type: string
1763917637
ceilometerNotificationImage:
1764017638
type: string
1764117639
ceilometerProxyImage:
@@ -19211,8 +19209,6 @@ spec:
1921119209
type: string
1921219210
ceilometerIpmiImage:
1921319211
type: string
19214-
ceilometerMysqldExporterImage:
19215-
type: string
1921619212
ceilometerNotificationImage:
1921719213
type: string
1921819214
ceilometerSgcoreImage:
@@ -19430,8 +19426,6 @@ spec:
1943019426
type: string
1943119427
ceilometerIpmiImage:
1943219428
type: string
19433-
ceilometerMysqldExporterImage:
19434-
type: string
1943519429
ceilometerNotificationImage:
1943619430
type: string
1943719431
ceilometerSgcoreImage:
@@ -19614,8 +19608,6 @@ spec:
1961419608
type: string
1961519609
ceilometerIpmiImage:
1961619610
type: string
19617-
ceilometerMysqldExporterImage:
19618-
type: string
1961919611
ceilometerNotificationImage:
1962019612
type: string
1962119613
ceilometerProxyImage:

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17470,8 +17470,6 @@ spec:
1747017470
type: string
1747117471
ceilometerIpmiImage:
1747217472
type: string
17473-
ceilometerMysqldExporterImage:
17474-
type: string
1747517473
ceilometerNotificationImage:
1747617474
type: string
1747717475
ceilometerProxyImage:

‎config/crd/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ spec:
6464
type: string
6565
ceilometerIpmiImage:
6666
type: string
67-
ceilometerMysqldExporterImage:
68-
type: string
6967
ceilometerNotificationImage:
7068
type: string
7169
ceilometerSgcoreImage:
@@ -283,8 +281,6 @@ spec:
283281
type: string
284282
ceilometerIpmiImage:
285283
type: string
286-
ceilometerMysqldExporterImage:
287-
type: string
288284
ceilometerNotificationImage:
289285
type: string
290286
ceilometerSgcoreImage:
@@ -467,8 +463,6 @@ spec:
467463
type: string
468464
ceilometerIpmiImage:
469465
type: string
470-
ceilometerMysqldExporterImage:
471-
type: string
472466
ceilometerNotificationImage:
473467
type: string
474468
ceilometerProxyImage:

‎config/operator/default_images.yaml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ spec:
3939
value: quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified
4040
- name: RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT
4141
value: quay.io/podified-antelope-centos9/openstack-ceilometer-notification:current-podified
42-
- name: RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT
43-
value: quay.io/prometheus/mysqld-exporter:v0.16.0
4442
- name: RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT
4543
value: quay.io/openstack-k8s-operators/sg-core:latest
4644
- name: RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT

‎hack/export_related_images.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ export RELATED_IMAGE_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT=quay.io/podified-antel
3434
export RELATED_IMAGE_CEILOMETER_NOTIFICATION_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-notification:current-podified
3535
export RELATED_IMAGE_CEILOMETER_IPMI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified
3636
export RELATED_IMAGE_CEILOMETER_SGCORE_IMAGE_URL_DEFAULT=quay.io/openstack-k8s-operators/sg-core:latest
37-
export RELATED_IMAGE_CEILOMETER_MYSQLD_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/mysqld-exporter:v0.16.0
3837
export RELATED_IMAGE_KSM_IMAGE_URL_DEFAULT=registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.10.0
3938
export RELATED_IMAGE_AODH_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-api:current-podified
4039
export RELATED_IMAGE_AODH_EVALUATOR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-aodh-evaluator:current-podified

‎pkg/openstack/telemetry.go‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
4747
instance.Status.ContainerImages.CeilometerNotificationImage = nil
4848
instance.Status.ContainerImages.CeilometerSgcoreImage = nil
4949
instance.Status.ContainerImages.CeilometerProxyImage = nil
50-
instance.Status.ContainerImages.CeilometerMysqldExporterImage = nil
5150
instance.Status.ContainerImages.AodhAPIImage = nil
5251
instance.Status.ContainerImages.AodhEvaluatorImage = nil
5352
instance.Status.ContainerImages.AodhNotifierImage = nil
@@ -98,7 +97,6 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
9897
}
9998
instance.Spec.Telemetry.Template.Autoscaling.Aodh.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
10099
instance.Spec.Telemetry.Template.Ceilometer.TLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
101-
instance.Spec.Telemetry.Template.Ceilometer.MysqldExporterTLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
102100
instance.Spec.Telemetry.Template.Ceilometer.KSMTLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
103101
instance.Spec.Telemetry.Template.MetricStorage.PrometheusTLS.CaBundleSecretName = instance.Status.TLS.CaBundleSecretName
104102

@@ -150,16 +148,6 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
150148
return ctrl.Result{}, err
151149
}
152150

153-
mysqldExporterSvcs, err := service.GetServicesListWithLabel(
154-
ctx,
155-
helper,
156-
instance.Namespace,
157-
map[string]string{common.AppSelector: "mysqld-exporter"},
158-
)
159-
if err != nil {
160-
return ctrl.Result{}, err
161-
}
162-
163151
// make sure to get to EndpointConfig when all service got created
164152
if len(aodhSvcs.Items) == len(instance.Spec.Telemetry.Template.Autoscaling.Aodh.Override.Service) {
165153
endpointDetails, ctrlResult, err := EnsureEndpointConfig(
@@ -248,7 +236,6 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
248236

249237
if telemetry.Status.Conditions.IsTrue(telemetryv1.CeilometerReadyCondition) {
250238
// NOTE: We don't have svc overrides for ceilometer objects.
251-
// Ceilometer
252239
endpointDetails, ctrlResult, err := EnsureEndpointConfig(
253240
ctx,
254241
instance,
@@ -269,29 +256,6 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
269256
// update TLS settings with cert secret
270257
instance.Spec.Telemetry.Template.Ceilometer.TLS.SecretName = endpointDetails.GetEndptCertSecret(service.EndpointInternal)
271258

272-
// MysqldExporter
273-
if telemetry.Spec.Ceilometer.MysqldExporterEnabled != nil && *telemetry.Spec.Ceilometer.MysqldExporterEnabled {
274-
endpointDetails, ctrlResult, err := EnsureEndpointConfig(
275-
ctx,
276-
instance,
277-
helper,
278-
telemetry,
279-
mysqldExporterSvcs,
280-
nil,
281-
corev1beta1.Override{},
282-
corev1beta1.OpenStackControlPlaneExposeTelemetryReadyCondition,
283-
false, // TODO (mschuppert) could be removed when all integrated service support TLS
284-
tls.API{},
285-
)
286-
if err != nil {
287-
return ctrlResult, err
288-
} else if (ctrlResult != ctrl.Result{}) {
289-
return ctrlResult, nil
290-
}
291-
// update TLS settings with cert secret
292-
instance.Spec.Telemetry.Template.Ceilometer.MysqldExporterTLS.SecretName = endpointDetails.GetEndptCertSecret(service.EndpointInternal)
293-
}
294-
295259
// NOTE: We don't have svc overrides for KSM objects too.
296260
ksmEpDetails, ctrlResult, err := EnsureEndpointConfig(
297261
ctx,
@@ -343,12 +307,6 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
343307
telemetry.Spec.Ceilometer.KSMImage = ""
344308
}
345309

346-
if version.Status.ContainerImages.CeilometerMysqldExporterImage != nil {
347-
telemetry.Spec.Ceilometer.MysqldExporterImage = *version.Status.ContainerImages.CeilometerMysqldExporterImage
348-
} else {
349-
telemetry.Spec.Ceilometer.MysqldExporterImage = ""
350-
}
351-
352310
if telemetry.Spec.Ceilometer.Secret == "" {
353311
telemetry.Spec.Ceilometer.Secret = instance.Spec.Secret
354312
}
@@ -391,7 +349,6 @@ func ReconcileTelemetry(ctx context.Context, instance *corev1beta1.OpenStackCont
391349
instance.Status.ContainerImages.CeilometerNotificationImage = version.Status.ContainerImages.CeilometerNotificationImage
392350
instance.Status.ContainerImages.CeilometerSgcoreImage = version.Status.ContainerImages.CeilometerSgcoreImage
393351
instance.Status.ContainerImages.CeilometerProxyImage = version.Status.ContainerImages.CeilometerProxyImage
394-
instance.Status.ContainerImages.CeilometerMysqldExporterImage = version.Status.ContainerImages.CeilometerMysqldExporterImage
395352
instance.Status.ContainerImages.KsmImage = version.Status.ContainerImages.KsmImage
396353
instance.Status.ContainerImages.AodhAPIImage = version.Status.ContainerImages.AodhAPIImage
397354
instance.Status.ContainerImages.AodhEvaluatorImage = version.Status.ContainerImages.AodhEvaluatorImage
@@ -419,7 +376,6 @@ func TelemetryImageMatch(ctx context.Context, controlPlane *corev1beta1.OpenStac
419376
!stringPointersEqual(controlPlane.Status.ContainerImages.CeilometerNotificationImage, version.Status.ContainerImages.CeilometerNotificationImage) ||
420377
!stringPointersEqual(controlPlane.Status.ContainerImages.CeilometerSgcoreImage, version.Status.ContainerImages.CeilometerSgcoreImage) ||
421378
!stringPointersEqual(controlPlane.Status.ContainerImages.CeilometerProxyImage, version.Status.ContainerImages.CeilometerProxyImage) ||
422-
!stringPointersEqual(controlPlane.Status.ContainerImages.CeilometerMysqldExporterImage, version.Status.ContainerImages.CeilometerMysqldExporterImage) ||
423379
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhAPIImage, version.Status.ContainerImages.AodhAPIImage) ||
424380
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhEvaluatorImage, version.Status.ContainerImages.AodhEvaluatorImage) ||
425381
!stringPointersEqual(controlPlane.Status.ContainerImages.AodhNotifierImage, version.Status.ContainerImages.AodhNotifierImage) ||

0 commit comments

Comments
 (0)