From 1449efa455983bbc3a86f8a30acc0d7bf9cb8d65 Mon Sep 17 00:00:00 2001 From: Yatin Karel Date: Tue, 2 Sep 2025 12:43:53 +0530 Subject: [PATCH] Enable northd metrics Depends-On: https://github.com/openstack-k8s-operators/ovn-operator/pull/475 Related-Issue: https://issues.redhat.com/browse/OSPRH-12568 --- .../core.openstack.org_openstackcontrolplanes.yaml | 3 +++ apis/go.mod | 6 +++--- apis/go.sum | 12 ++++++------ bindata/crds/crds.yaml | 3 +++ bindata/crds/ovn.openstack.org_ovnnorthds.yaml | 10 ++++++++++ bindata/rbac/ovn-operator-rbac.yaml | 2 -- .../core.openstack.org_openstackcontrolplanes.yaml | 3 +++ config/operator/manager_operator_images.yaml | 4 ++-- go.mod | 6 +++--- go.sum | 12 ++++++------ hack/export_operator_related_images.sh | 4 ++-- pkg/openstack/ovn.go | 3 +++ 12 files changed, 44 insertions(+), 24 deletions(-) diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml index 871a3ed052..4b00ee86bb 100644 --- a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -11976,6 +11976,9 @@ spec: logLevel: default: info type: string + metricsEnabled: + default: true + type: boolean nThreads: default: 1 format: int32 diff --git a/apis/go.mod b/apis/go.mod index 7649b7311c..175a208a7d 100644 --- a/apis/go.mod +++ b/apis/go.mod @@ -13,10 +13,10 @@ require ( github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250814060741-0c7a610650fc github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811080827-7f14ec4286df github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-532e7d0773d4 - github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1 + github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002 github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f - github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f + github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03 github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250730071847-837b07f8d72f github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811082751-434506f532d6 github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20250811132527-8b60a24b4cd5 @@ -24,7 +24,7 @@ require ( github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250811132528-e890fbdf8726 github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 - github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f + github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250902142123-a16588bf7967 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250811132820-f9e60d64606b diff --git a/apis/go.sum b/apis/go.sum index 6be46435af..e924ee8f1f 100644 --- a/apis/go.sum +++ b/apis/go.sum @@ -106,14 +106,14 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811080827-7f1 github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811080827-7f14ec4286df/go.mod h1:y16BCG7hNokhES49d9CX7l8jtIl8Mw91J7y0YA0tLdY= github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-532e7d0773d4 h1:1VUcIKfRa1Kx2rSF1NnuKV/UJiI4wciW/zVqPy/HnIY= github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-532e7d0773d4/go.mod h1:qQskPomQnfNqHtxLQ8Y/CJhCJHFIsWU4KEGFuV8uwQU= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1 h1:77TRnwfSxNI5cn/RxMS9I+kqefMm7XRQsNknIhEE4tg= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec h1:Jvz2BuTWCvjeCbDzpPzlPMrUQpEe04Rzi8LPNxeW0Ts= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY= github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002 h1:B00JghiduA2ItmtptItSRYhCxysT0aIkDaWQyGRpUno= github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002/go.mod h1:B6LsM/f4MHzgoEOH2lQrEPyG5F3gmbhz4IyaUOAgj2o= github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f h1:Ivo4YKaH26B1lQlwKcolELCRGtEbmvbfJShBTVrCdQI= github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f/go.mod h1:H5iZOohoVOmZvIZPR5ep6z+jmfrpz25axOM6IXlXzNU= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f h1:DW8aNjEtDFrWiZ6vWuOXwdRB4eBD0n+bA9foQkOEx6U= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f/go.mod h1:P+7F1wiwZUxOy4myYXFyc/uBtGATDFpk3yAllXe1Vzk= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03 h1:9VanDdvg1APf9B1nzGElLvWr6dM5GsSayMLSV/nJZnE= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03/go.mod h1:Z+rmtn3qhuPZfx2EDVmloUh2MkYbvDMgcpJneRYerS0= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250730071847-837b07f8d72f h1:nGYLHcpM7EjiSzN4bmiLZbxty9u0k0Qzvkqn+1s1TF0= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250730071847-837b07f8d72f/go.mod h1:nachFP0Yicw/e8ZlqZzvnBN6w9kjMcnqrhaDw36PGjw= github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250730071847-837b07f8d72f h1:/e/jQu3GThcystmZFyzlQq6nOKpORQq84HhcbkKxAq4= @@ -130,8 +130,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816- github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494/go.mod h1:kWC1tu28WMErEU8PtMyhEUMqC1BGT0+VmMyuFTeR/Tk= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 h1:rgZEgrgk9gRGhWdvDNEgzDgtfHp4leZaHMzya4bZXDU= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y= -github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f h1:p/LpkWcRpFsrUxgqw4v9iuSNJ1+dD+buPS4OAmagAOc= -github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f/go.mod h1:YWZ2qLvvqsgIcHQsJT9+tdC1r7OfdcNIJnJbU4Ddxj4= +github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250902142123-a16588bf7967 h1:r5+yw+vAt26OsZfbO0Xa7Ox4MYxMFrKCVgKnY3ZamiM= +github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250902142123-a16588bf7967/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc= github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef h1:/z0xPP6BdaJJu/0qIH9kpuFELqiNAkp53laelyy8e6I= github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef/go.mod h1:8ssUFKkbxaSxMCVjCut4zz8/qZAtLgiKg3TnojFCxks= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4= diff --git a/bindata/crds/crds.yaml b/bindata/crds/crds.yaml index 00523cdea6..c214c6775e 100644 --- a/bindata/crds/crds.yaml +++ b/bindata/crds/crds.yaml @@ -12140,6 +12140,9 @@ spec: logLevel: default: info type: string + metricsEnabled: + default: true + type: boolean nThreads: default: 1 format: int32 diff --git a/bindata/crds/ovn.openstack.org_ovnnorthds.yaml b/bindata/crds/ovn.openstack.org_ovnnorthds.yaml index 410a6dbaed..be3e89800e 100644 --- a/bindata/crds/ovn.openstack.org_ovnnorthds.yaml +++ b/bindata/crds/ovn.openstack.org_ovnnorthds.yaml @@ -52,10 +52,20 @@ spec: description: ContainerImage - Container Image URL (will be set to environmental default if empty) type: string + exporterImage: + default: quay.io/openstack-k8s-operators/openstack-network-exporter:current-podified + description: ExporterImage - Container Image URL for the openstack-network-exporter + metrics sidecar (will be set to environmental default if empty) + type: string logLevel: default: info description: LogLevel - Set log level info, dbg, emer etc type: string + metricsEnabled: + default: true + description: MetricsEnabled enables the metrics sidecar container + for collecting OVN metrics + type: boolean nThreads: default: 1 description: NThreads sets number of threads used for building logical diff --git a/bindata/rbac/ovn-operator-rbac.yaml b/bindata/rbac/ovn-operator-rbac.yaml index e823b58501..b674b8e9d7 100644 --- a/bindata/rbac/ovn-operator-rbac.yaml +++ b/bindata/rbac/ovn-operator-rbac.yaml @@ -90,13 +90,11 @@ rules: resources: - deployments verbs: - - create - delete - get - list - patch - update - - watch - apiGroups: - apps resources: diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml index 871a3ed052..4b00ee86bb 100644 --- a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml +++ b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml @@ -11976,6 +11976,9 @@ spec: logLevel: default: info type: string + metricsEnabled: + default: true + type: boolean nThreads: default: 1 format: int32 diff --git a/config/operator/manager_operator_images.yaml b/config/operator/manager_operator_images.yaml index c55db3c5dd..6add41b27f 100644 --- a/config/operator/manager_operator_images.yaml +++ b/config/operator/manager_operator_images.yaml @@ -26,7 +26,7 @@ spec: - name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/horizon-operator@sha256:8a0327a5b60b92c073eecc29e7eaac9b6f96311367edbba1352a15279fbac651 - name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL - value: quay.io/openstack-k8s-operators/infra-operator@sha256:a3919b630e49d4c1f9d496fa2a91129587729c4df8a0a643e665bba5618c3f0c + value: quay.io/openstack-k8s-operators/infra-operator@sha256:f64112fcc73671137b07393ebf3a00b94c3330c14a958970c7353b997f7e2423 - name: RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/ironic-operator@sha256:747406033b6d0f33f9131730817bcbaa4f93e4f56ed98018840f0e2bb857bbbb - name: RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL @@ -44,7 +44,7 @@ spec: - name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:046ecfcbe3dd107659e3152411e7a2713e7409eeaaf3219d06dbbbdb0e913d97 - name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL - value: quay.io/openstack-k8s-operators/ovn-operator@sha256:e91397212280801d4f6eaf91ed16dbc677c6fa509178de71e50819b009108498 + value: quay.io/openstack-k8s-operators/ovn-operator@sha256:0d607da31b021b528800b51587c0237acccb5e001c80910630b4a3080c7df190 - name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL value: quay.io/openstack-k8s-operators/placement-operator@sha256:9cdc2300064950b91e1407dd0182c11e740aff5dac32bb01e66e13d41f398fd4 - name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL diff --git a/go.mod b/go.mod index 5b2245a024..4dfcefd666 100644 --- a/go.mod +++ b/go.mod @@ -18,12 +18,12 @@ require ( github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250814060741-0c7a610650fc github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811080827-7f14ec4286df github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-532e7d0773d4 - github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1 + github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002 github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250730071847-837b07f8d72f github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20250730071847-837b07f8d72f - github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f + github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03 github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250730071847-837b07f8d72f github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250730071847-837b07f8d72f github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20250811082751-434506f532d6 @@ -33,7 +33,7 @@ require ( github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c - github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f + github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250902142123-a16588bf7967 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250811072921-e4cdf967663d github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250811132820-f9e60d64606b diff --git a/go.sum b/go.sum index efccc4700f..dd8eb1502c 100644 --- a/go.sum +++ b/go.sum @@ -110,8 +110,8 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811080827-7f1 github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250811080827-7f14ec4286df/go.mod h1:y16BCG7hNokhES49d9CX7l8jtIl8Mw91J7y0YA0tLdY= github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-532e7d0773d4 h1:1VUcIKfRa1Kx2rSF1NnuKV/UJiI4wciW/zVqPy/HnIY= github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250811063920-532e7d0773d4/go.mod h1:qQskPomQnfNqHtxLQ8Y/CJhCJHFIsWU4KEGFuV8uwQU= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1 h1:77TRnwfSxNI5cn/RxMS9I+kqefMm7XRQsNknIhEE4tg= -github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250813063935-fdc20530dcf1/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec h1:Jvz2BuTWCvjeCbDzpPzlPMrUQpEe04Rzi8LPNxeW0Ts= +github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250821143610-c8ef7b9a21ec/go.mod h1:Dv8qpmBIQy3Jv/EyQnOyc0w61X8vyfxpjcIQONP5CwY= github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002 h1:B00JghiduA2ItmtptItSRYhCxysT0aIkDaWQyGRpUno= github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250815193050-feadf3472002/go.mod h1:B6LsM/f4MHzgoEOH2lQrEPyG5F3gmbhz4IyaUOAgj2o= github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250811083324-e790d63f389f h1:Ivo4YKaH26B1lQlwKcolELCRGtEbmvbfJShBTVrCdQI= @@ -120,8 +120,8 @@ github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.202507300 github.com/openstack-k8s-operators/lib-common/modules/ansible v0.6.1-0.20250730071847-837b07f8d72f/go.mod h1:0bajRHochTUT6Ecfriw27l3vL0yezVrnUmt3bcIpu4w= github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20250730071847-837b07f8d72f h1:1T8716FlCs3wokHLL6jo7iYuMZfEdtTghvdFIjkmJhE= github.com/openstack-k8s-operators/lib-common/modules/certmanager v0.6.1-0.20250730071847-837b07f8d72f/go.mod h1:FLBKWID1Y6ZiNjHIIRbtsUDHVN+DPR28+e6gXYAwNhQ= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f h1:DW8aNjEtDFrWiZ6vWuOXwdRB4eBD0n+bA9foQkOEx6U= -github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250730071847-837b07f8d72f/go.mod h1:P+7F1wiwZUxOy4myYXFyc/uBtGATDFpk3yAllXe1Vzk= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03 h1:9VanDdvg1APf9B1nzGElLvWr6dM5GsSayMLSV/nJZnE= +github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250823121217-7e1cd2e3dd03/go.mod h1:Z+rmtn3qhuPZfx2EDVmloUh2MkYbvDMgcpJneRYerS0= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250730071847-837b07f8d72f h1:nGYLHcpM7EjiSzN4bmiLZbxty9u0k0Qzvkqn+1s1TF0= github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250730071847-837b07f8d72f/go.mod h1:nachFP0Yicw/e8ZlqZzvnBN6w9kjMcnqrhaDw36PGjw= github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250730071847-837b07f8d72f h1:/e/jQu3GThcystmZFyzlQq6nOKpORQq84HhcbkKxAq4= @@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816- github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250811132816-395cc3f32494/go.mod h1:kWC1tu28WMErEU8PtMyhEUMqC1BGT0+VmMyuFTeR/Tk= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1 h1:rgZEgrgk9gRGhWdvDNEgzDgtfHp4leZaHMzya4bZXDU= github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250811072630-c2b6e30af3a1/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y= -github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f h1:p/LpkWcRpFsrUxgqw4v9iuSNJ1+dD+buPS4OAmagAOc= -github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250811132819-b267d3671d1f/go.mod h1:YWZ2qLvvqsgIcHQsJT9+tdC1r7OfdcNIJnJbU4Ddxj4= +github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250902142123-a16588bf7967 h1:r5+yw+vAt26OsZfbO0Xa7Ox4MYxMFrKCVgKnY3ZamiM= +github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250902142123-a16588bf7967/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc= github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef h1:/z0xPP6BdaJJu/0qIH9kpuFELqiNAkp53laelyy8e6I= github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250811072922-3ada315d8eef/go.mod h1:8ssUFKkbxaSxMCVjCut4zz8/qZAtLgiKg3TnojFCxks= github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4= diff --git a/hack/export_operator_related_images.sh b/hack/export_operator_related_images.sh index 6ddd1bdd23..4e085404ed 100644 --- a/hack/export_operator_related_images.sh +++ b/hack/export_operator_related_images.sh @@ -6,7 +6,7 @@ export RELATED_IMAGE_DESIGNATE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s- export RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/glance-operator@sha256:abb75a44c153dd6ab6f508fe692fe51ffe8543d25e940d7d78fbed84eb3a68de export RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/heat-operator@sha256:859ea0ebcd0462cd8a98ee3a286bb40bacc6b8c77f5a2e6cd2c41537acdc330b export RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/horizon-operator@sha256:8a0327a5b60b92c073eecc29e7eaac9b6f96311367edbba1352a15279fbac651 -export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:a3919b630e49d4c1f9d496fa2a91129587729c4df8a0a643e665bba5618c3f0c +export RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/infra-operator@sha256:f64112fcc73671137b07393ebf3a00b94c3330c14a958970c7353b997f7e2423 export RELATED_IMAGE_IRONIC_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ironic-operator@sha256:747406033b6d0f33f9131730817bcbaa4f93e4f56ed98018840f0e2bb857bbbb export RELATED_IMAGE_KEYSTONE_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/keystone-operator@sha256:b96007ee1ab496ffb9b6ee478b6b68c62e80a216b98a2ac1d65b09504016712d export RELATED_IMAGE_MANILA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/manila-operator@sha256:72c7403d2e2bda84655d89c80528e8c06797905ccd7ef09761aaf4bae782757f @@ -15,7 +15,7 @@ export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-op export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:1796872d91b5f471542bf019d7ad1541b0246099c02f805548259f62e80fb03a export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:a3073efc8463485947f21724fa5904bdd7b59fe491af95bd5f17770c052565ec export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:046ecfcbe3dd107659e3152411e7a2713e7409eeaaf3219d06dbbbdb0e913d97 -export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:e91397212280801d4f6eaf91ed16dbc677c6fa509178de71e50819b009108498 +export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:0d607da31b021b528800b51587c0237acccb5e001c80910630b4a3080c7df190 export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:9cdc2300064950b91e1407dd0182c11e740aff5dac32bb01e66e13d41f398fd4 export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:64ff1d97f0a283ed3b3dfec7f4903c883e30533ffcb363b446a5ced7f7472506 diff --git a/pkg/openstack/ovn.go b/pkg/openstack/ovn.go index 54a597fd31..88a9c7b437 100644 --- a/pkg/openstack/ovn.go +++ b/pkg/openstack/ovn.go @@ -220,6 +220,7 @@ func ReconcileOVNNorthd(ctx context.Context, instance *corev1beta1.OpenStackCont if !instance.Spec.Ovn.Enabled { instance.Status.ContainerImages.OvnNorthdImage = nil + instance.Status.ContainerImages.OpenstackNetworkExporterImage = nil if _, err := EnsureDeleted(ctx, helper, OVNNorthd); err != nil { return false, err } @@ -295,6 +296,7 @@ func ReconcileOVNNorthd(ctx context.Context, instance *corev1beta1.OpenStackCont instance.Spec.Ovn.Template.OVNNorthd.DeepCopyInto(&OVNNorthd.Spec.OVNNorthdSpecCore) OVNNorthd.Spec.ContainerImage = *version.Status.ContainerImages.OvnNorthdImage + OVNNorthd.Spec.ExporterImage = *getImg(version.Status.ContainerImages.OpenstackNetworkExporterImage, &missingImageDefault) err := controllerutil.SetControllerReference(helper.GetBeforeObject(), OVNNorthd, helper.GetScheme()) if err != nil { @@ -319,6 +321,7 @@ func ReconcileOVNNorthd(ctx context.Context, instance *corev1beta1.OpenStackCont if OVNNorthd.Status.ObservedGeneration == OVNNorthd.Generation && OVNNorthd.IsReady() { //revive:disable:indent-error-flow instance.Status.ContainerImages.OvnNorthdImage = version.Status.ContainerImages.OvnNorthdImage + instance.Status.ContainerImages.OpenstackNetworkExporterImage = version.Status.ContainerImages.OpenstackNetworkExporterImage return true, nil } else { return false, nil