openstack-k8s-operators · openshift-merge-bot · Sep 12, 2025 · Sep 11, 2025
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -11781,6 +11781,9 @@ spec:
                                 default: random
                                 type: string
                             type: object
+                          metricsEnabled:
+                            default: true
+                            type: boolean
                           networkAttachment:
                             type: string
                           nicMappings:

diff --git a/apis/go.mod b/apis/go.mod
@@ -24,7 +24,7 @@ require (
 	github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250821233804-a68262cb33eb
 	github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-a6da364cfa8e
 	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb
-	github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538
+	github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0
 	github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c
 	github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250905151959-af12213cc734
 	github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250904143534-756d992c64fe

diff --git a/apis/go.sum b/apis/go.sum
@@ -130,8 +130,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-
 github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-a6da364cfa8e/go.mod h1:cpuJ720zrbnpvvMQLCiwnsS5RJXwHZmzLsigCRhhiIQ=
 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb h1:MH2h0C65QhSmVGPMEloufuSuKLR1t193AELvtpicNwE=
 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y=
-github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538 h1:BLMcjUrh2y+u7efuvqFAWpeYyjqZbAcHPhigtnNhitU=
-github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
+github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0 h1:MI33VHB8oyhCeJLP7S1aYAWL8f4HJoCvq155ThR7bK8=
+github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c h1:thTQEtjo25kEYW+woLiPpvByMmWkI/jhh+sWokJtLN4=
 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c/go.mod h1:qs5IDS8g5krd05ts6sQ+37nP652K7bduJW90j1HMFcc=
 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
@@ -11945,6 +11945,9 @@ spec:
                                 default: random
                                 type: string
                             type: object
+                          metricsEnabled:
+                            default: true
+                            type: boolean
                           networkAttachment:
                             type: string
                           nicMappings:

diff --git a/bindata/crds/ovn.openstack.org_ovncontrollers.yaml b/bindata/crds/ovn.openstack.org_ovncontrollers.yaml
@@ -52,6 +52,10 @@ spec:
           spec:
             description: OVNControllerSpec defines the desired state of OVNController
             properties:
+              exporterImage:
+                description: ExporterImage - Container Image URL for the openstack-network-exporter
+                  metrics daemonset (will be set to environmental default if empty)
+                type: string
               external-ids:
                 default: {}
                 description: OVSExternalIDs is a set of configuration options for
@@ -81,6 +85,11 @@ spec:
                     default: random
                     type: string
                 type: object
+              metricsEnabled:
+                default: true
+                description: MetricsEnabled enables the metrics daemonset for collecting
+                  OVN metrics
+                type: boolean
               networkAttachment:
                 description: |-
                   NetworkAttachment is a NetworkAttachment resource name to expose the service to the given network.
@@ -263,6 +272,10 @@ spec:
                       current project
                     type: string
                 type: object
+              metricsNumberReady:
+                description: MetricsNumberReady of metrics instances
+                format: int32
+                type: integer
               networkAttachments:
                 additionalProperties:
                   items:

diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -11781,6 +11781,9 @@ spec:
                                 default: random
                                 type: string
                             type: object
+                          metricsEnabled:
+                            default: true
+                            type: boolean
                           networkAttachment:
                             type: string
                           nicMappings:

diff --git a/config/operator/manager_operator_images.yaml b/config/operator/manager_operator_images.yaml
@@ -44,7 +44,7 @@ spec:
         - name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
           value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:1148bd6f8ff420abb56012407628d97f287265b17b9ac81b358cdfbe6f1eb87b
         - name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
-          value: quay.io/openstack-k8s-operators/ovn-operator@sha256:913f38aafcad94c46daf2eae66dfa72410aea7652ffe1f34344f5971e75e0dce
+          value: quay.io/openstack-k8s-operators/ovn-operator@sha256:0ae78d21beb9bbf40bd68a189d925abd20d95bda53318da0852bf9d6f7bdd963
         - name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL
           value: quay.io/openstack-k8s-operators/placement-operator@sha256:bd227f00edf8b53aa653270a3d15adbbc8258c3e6bf909c0cca8f4c65070548b
         - name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL

diff --git a/go.mod b/go.mod
@@ -33,7 +33,7 @@ require (
 	github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-a6da364cfa8e
 	github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb
 	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.20250905123257-bfe70a8d4538
+	github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0
 	github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c
 	github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250905151959-af12213cc734
 	github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250904143534-756d992c64fe

diff --git a/go.sum b/go.sum
@@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-
 github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-a6da364cfa8e/go.mod h1:cpuJ720zrbnpvvMQLCiwnsS5RJXwHZmzLsigCRhhiIQ=
 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb h1:MH2h0C65QhSmVGPMEloufuSuKLR1t193AELvtpicNwE=
 github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y=
-github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538 h1:BLMcjUrh2y+u7efuvqFAWpeYyjqZbAcHPhigtnNhitU=
-github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
+github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0 h1:MI33VHB8oyhCeJLP7S1aYAWL8f4HJoCvq155ThR7bK8=
+github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c h1:thTQEtjo25kEYW+woLiPpvByMmWkI/jhh+sWokJtLN4=
 github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c/go.mod h1:qs5IDS8g5krd05ts6sQ+37nP652K7bduJW90j1HMFcc=
 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
@@ -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:1d198c76f354fb15c60111882c2cca2f8fee4d4893d1785397ed00ee879b0ab9
 export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:28e954bf561874e96dd9d376cdfecddb297ac0f165c733327ad55f42d68896c8
 export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:1148bd6f8ff420abb56012407628d97f287265b17b9ac81b358cdfbe6f1eb87b
-export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:913f38aafcad94c46daf2eae66dfa72410aea7652ffe1f34344f5971e75e0dce
+export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:0ae78d21beb9bbf40bd68a189d925abd20d95bda53318da0852bf9d6f7bdd963
 export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:bd227f00edf8b53aa653270a3d15adbbc8258c3e6bf909c0cca8f4c65070548b
 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:60aecc02f350443839570b4a7c746daad0d86db91b1216d29339dad0c44e8623

diff --git a/pkg/openstack/ovn.go b/pkg/openstack/ovn.go
@@ -430,6 +430,7 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack
 
 		OVNController.Spec.OvnContainerImage = *version.Status.ContainerImages.OvnControllerImage
 		OVNController.Spec.OvsContainerImage = *version.Status.ContainerImages.OvnControllerOvsImage
+		OVNController.Spec.ExporterImage = *getImg(version.Status.ContainerImages.OpenstackNetworkExporterImage, &missingImageDefault)
 
 		err := controllerutil.SetControllerReference(helper.GetBeforeObject(), OVNController, helper.GetScheme())
 		if err != nil {
@@ -456,6 +457,7 @@ func ReconcileOVNController(ctx context.Context, instance *corev1beta1.OpenStack
 		Log.Info("OVN Controller ready condition is true")
 		instance.Status.ContainerImages.OvnControllerImage = version.Status.ContainerImages.OvnControllerImage
 		instance.Status.ContainerImages.OvnControllerOvsImage = version.Status.ContainerImages.OvnControllerOvsImage
+		instance.Status.ContainerImages.OpenstackNetworkExporterImage = version.Status.ContainerImages.OpenstackNetworkExporterImage
 		return true, nil
 	} else {
 		return false, nil