Skip to content

Commit 915552c

Browse files
Merge pull request #1630 from vyzigold/validate-telemetry
[OSPRH-20362] Run telemetry validation webhooks
2 parents b9af9b0 + c7468ca commit 915552c

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

apis/core/v1beta1/openstackcontrolplane_webhook.go

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

368+
if r.Spec.Telemetry.Enabled {
369+
errors = append(errors, r.Spec.Telemetry.Template.ValidateCreate(basePath.Child("telemetry").Child("template"), r.Namespace)...)
370+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.AodhAPIOverride.Route, basePath.Child("telemetry").Child("aodhApiOverride").Child("route"))...)
371+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.PrometheusOverride.Route, basePath.Child("telemetry").Child("prometheusOverride").Child("route"))...)
372+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.AlertmanagerOverride.Route, basePath.Child("telemetry").Child("alertmanagerOverride").Child("route"))...)
373+
}
374+
368375
// Validation for remaining services...
369376
if r.Spec.Galera.Enabled {
370377
for key, s := range *r.Spec.Galera.Templates {
@@ -560,6 +567,15 @@ func (r *OpenStackControlPlane) ValidateUpdateServices(old OpenStackControlPlane
560567
errors = append(errors, r.Spec.Watcher.Template.ValidateUpdate(*old.Watcher.Template, basePath.Child("watcher").Child("template"), r.Namespace)...)
561568
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Watcher.APIOverride.Route, basePath.Child("watcher").Child("apiOverride").Child("route"))...)
562569
}
570+
if r.Spec.Telemetry.Enabled {
571+
if old.Telemetry.Template == nil {
572+
old.Telemetry.Template = &telemetryv1.TelemetrySpecCore{}
573+
}
574+
errors = append(errors, r.Spec.Telemetry.Template.ValidateUpdate(*old.Telemetry.Template, basePath.Child("telemetry").Child("template"), r.Namespace)...)
575+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.AodhAPIOverride.Route, basePath.Child("telemetry").Child("aodhApiOverride").Child("route"))...)
576+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.PrometheusOverride.Route, basePath.Child("telemetry").Child("prometheusOverride").Child("route"))...)
577+
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Telemetry.AlertmanagerOverride.Route, basePath.Child("telemetry").Child("alertmanagerOverride").Child("route"))...)
578+
}
563579

564580
if r.Spec.Memcached.Enabled {
565581
if r.Spec.Memcached.Templates != nil {

0 commit comments

Comments
 (0)