Skip to content

Commit 06ec3e1

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

7 files changed

Lines changed: 24 additions & 8 deletions

File tree

‎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 {

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ require (
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251002031541-4f99b04c9a13
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251002024911-eda4e9d455fc
2929
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251001195308-6e48eaca3a44
30-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002052038-52dba534fe5d
30+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002184157-776d69370e4c
3131
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251002070254-9193f53c7e61
3232
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
3333
github.com/rhobs/observability-operator v0.3.1 // indirect

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,8 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2025092
144144
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
145145
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251001195308-6e48eaca3a44 h1:6DlvNXjDrnIT9waxnjTvX43lZYp9mnQ0YV4lOWGzwvA=
146146
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251001195308-6e48eaca3a44/go.mod h1:YJViO6zHLQNhndqEWhRUrhTfLlMAzkWCcW5hEjSId5U=
147-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002052038-52dba534fe5d h1:B20fG6gSSRTXXvlF7ez/P+6LTJumxBgoJr+2+MU5Qdg=
148-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002052038-52dba534fe5d/go.mod h1:90pZbxlkgulaE86HNaGF2CWeYyttpzVRnp3TOTYNtHg=
147+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002184157-776d69370e4c h1:aur2GhV3rpGl5YhPnzsOFMPbaVm6Y4+HPECaC7KLmWU=
148+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002184157-776d69370e4c/go.mod h1:90pZbxlkgulaE86HNaGF2CWeYyttpzVRnp3TOTYNtHg=
149149
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251002070254-9193f53c7e61 h1:itdb1Sm/1QM1F1vledVMd8ytJ17pGoY39WGV7NuWuZk=
150150
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251002070254-9193f53c7e61/go.mod h1:J4BLz39hN6A5y7H/PlC+yXTyCa6QPFPJkwniM1HiKks=
151151
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ spec:
5252
- name: RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL
5353
value: quay.io/openstack-k8s-operators/swift-operator@sha256:637bb7b9ac308bc1e323391a3593b824f688090a856c83385814c17a571b1eed
5454
- name: RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL
55-
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:8f5eee2eb7b77432ef1a88ed693ff981514359dfc808581f393bcef252de5cfa
55+
value: quay.io/openstack-k8s-operators/telemetry-operator@sha256:bf55026ba10b80e1e24733078bd204cef8766d21a305fd000707a1e3b30ff52e
5656
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL
5757
value: quay.io/openstack-k8s-operators/test-operator@sha256:0daf76cc40ab619ae266b11defcc1b65beb22d859369e7b1b04de9169089a4cb
5858
- name: RELATED_IMAGE_WATCHER_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ require (
3636
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251002031541-4f99b04c9a13
3737
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251002024911-eda4e9d455fc
3838
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251001195308-6e48eaca3a44
39-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002052038-52dba534fe5d
39+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002184157-776d69370e4c
4040
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20251002070558-2e74e89f35f3
4141
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251002070254-9193f53c7e61
4242
github.com/pkg/errors v0.9.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.2025092
154154
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
155155
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251001195308-6e48eaca3a44 h1:6DlvNXjDrnIT9waxnjTvX43lZYp9mnQ0YV4lOWGzwvA=
156156
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251001195308-6e48eaca3a44/go.mod h1:YJViO6zHLQNhndqEWhRUrhTfLlMAzkWCcW5hEjSId5U=
157-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002052038-52dba534fe5d h1:B20fG6gSSRTXXvlF7ez/P+6LTJumxBgoJr+2+MU5Qdg=
158-
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002052038-52dba534fe5d/go.mod h1:90pZbxlkgulaE86HNaGF2CWeYyttpzVRnp3TOTYNtHg=
157+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002184157-776d69370e4c h1:aur2GhV3rpGl5YhPnzsOFMPbaVm6Y4+HPECaC7KLmWU=
158+
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251002184157-776d69370e4c/go.mod h1:90pZbxlkgulaE86HNaGF2CWeYyttpzVRnp3TOTYNtHg=
159159
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20251002070558-2e74e89f35f3 h1:aAyF2jfwC3N4nHy0tFnGislwts6udRTM8VOsJC+W3DY=
160160
github.com/openstack-k8s-operators/test-operator/api v0.6.1-0.20251002070558-2e74e89f35f3/go.mod h1:x1PtflEo8WEZLu41Njw2KgiiKE9uHiaFVvCWu8f1hIc=
161161
github.com/openstack-k8s-operators/watcher-operator/api v0.6.1-0.20251002070254-9193f53c7e61 h1:itdb1Sm/1QM1F1vledVMd8ytJ17pGoY39WGV7NuWuZk=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operat
1919
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:725da67b3f9cf2758564e0111928cdd570c0f6f1ca34775f159bbe94deb82548
2020
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:893e66303c1b0bc1d00a299a3f0380bad55c8dc813c8a1c6a4aab379f5aa12a2
2121
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:637bb7b9ac308bc1e323391a3593b824f688090a856c83385814c17a571b1eed
22-
export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:8f5eee2eb7b77432ef1a88ed693ff981514359dfc808581f393bcef252de5cfa
22+
export RELATED_IMAGE_TELEMETRY_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/telemetry-operator@sha256:bf55026ba10b80e1e24733078bd204cef8766d21a305fd000707a1e3b30ff52e
2323
export RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/test-operator@sha256:0daf76cc40ab619ae266b11defcc1b65beb22d859369e7b1b04de9169089a4cb
2424
export RELATED_IMAGE_WATCHER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/watcher-operator@sha256:018151bd5ff830ec03c6b8e3d53cfb9456ca6e1e34793bdd4f7edd39a0146fa6

0 commit comments

Comments
 (0)