Skip to content

Commit 6073763

Browse files
committed
[OSPRH-20362] Run telemetry validation webhooks
Depends-On: openstack-k8s-operators/telemetry-operator#765
1 parent 6540350 commit 6073763

1 file changed

Lines changed: 16 additions & 0 deletions

File tree

apis/core/v1beta1/openstackcontrolplane_webhook.go

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -357,6 +357,13 @@ func (r *OpenStackControlPlane) ValidateCreateServices(basePath *field.Path) (ad
357357
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Watcher.APIOverride.Route, basePath.Child("watcher").Child("apiOverride").Child("route"))...)
358358
}
359359

360+
if r.Spec.Telemetry.Enabled {
361+
errors = append(errors, r.Spec.Telemetry.Template.ValidateCreate(basePath.Child("telemetry").Child("template"), r.Namespace)...)
362+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.AodhAPIOverride.Route, basePath.Child("telemetry").Child("aodhApiOverride").Child("route"))...)
363+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.PrometheusOverride.Route, basePath.Child("telemetry").Child("prometheusOverride").Child("route"))...)
364+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.AlertmanagerOverride.Route, basePath.Child("telemetry").Child("alertmanagerOverride").Child("route"))...)
365+
}
366+
360367
// Validation for remaining services...
361368
if r.Spec.Galera.Enabled {
362369
for key, s := range *r.Spec.Galera.Templates {
@@ -552,6 +559,15 @@ func (r *OpenStackControlPlane) ValidateUpdateServices(old OpenStackControlPlane
552559
errors = append(errors, r.Spec.Watcher.Template.ValidateUpdate(*old.Watcher.Template, basePath.Child("watcher").Child("template"), r.Namespace)...)
553560
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Watcher.APIOverride.Route, basePath.Child("watcher").Child("apiOverride").Child("route"))...)
554561
}
562+
if r.Spec.Telemetry.Enabled {
563+
if old.Telemetry.Template == nil {
564+
old.Telemetry.Template = &telemetryv1.TelemetrySpecCore{}
565+
}
566+
errors = append(errors, r.Spec.Telemetry.Template.ValidateUpdate(*old.Telemetry.Template, basePath.Child("telemetry").Child("template"), r.Namespace)...)
567+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.AodhAPIOverride.Route, basePath.Child("telemetry").Child("aodhApiOverride").Child("route"))...)
568+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.PrometheusOverride.Route, basePath.Child("telemetry").Child("prometheusOverride").Child("route"))...)
569+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.AlertmanagerOverride.Route, basePath.Child("telemetry").Child("alertmanagerOverride").Child("route"))...)
570+
}
555571

556572
if r.Spec.Memcached.Enabled {
557573
if r.Spec.Memcached.Templates != nil {

0 commit comments

Comments
 (0)