Skip to content

Commit 6c81983

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1597 from karelyatin/OSPRH-12560
Enable OVNController/OVSVswitchd Metrics
2 parents cf133b3 + c88a530 commit 6c81983

File tree

11 files changed

+32
-8
lines changed

11 files changed

+32
-8
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11781,6 +11781,9 @@ spec:
1178111781
default: random
1178211782
type: string
1178311783
type: object
11784+
metricsEnabled:
11785+
default: true
11786+
type: boolean
1178411787
networkAttachment:
1178511788
type: string
1178611789
nicMappings:

‎apis/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/openstack-k8s-operators/nova-operator/api v0.6.1-0.20250821233804-a68262cb33eb
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-a6da364cfa8e
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c
2929
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250905151959-af12213cc734
3030
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250904143534-756d992c64fe

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-
130130
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-a6da364cfa8e/go.mod h1:cpuJ720zrbnpvvMQLCiwnsS5RJXwHZmzLsigCRhhiIQ=
131131
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb h1:MH2h0C65QhSmVGPMEloufuSuKLR1t193AELvtpicNwE=
132132
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y=
133-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538 h1:BLMcjUrh2y+u7efuvqFAWpeYyjqZbAcHPhigtnNhitU=
134-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
133+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0 h1:MI33VHB8oyhCeJLP7S1aYAWL8f4HJoCvq155ThR7bK8=
134+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
135135
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c h1:thTQEtjo25kEYW+woLiPpvByMmWkI/jhh+sWokJtLN4=
136136
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c/go.mod h1:qs5IDS8g5krd05ts6sQ+37nP652K7bduJW90j1HMFcc=
137137
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4=

‎bindata/crds/crds.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11945,6 +11945,9 @@ spec:
1194511945
default: random
1194611946
type: string
1194711947
type: object
11948+
metricsEnabled:
11949+
default: true
11950+
type: boolean
1194811951
networkAttachment:
1194911952
type: string
1195011953
nicMappings:

‎bindata/crds/ovn.openstack.org_ovncontrollers.yaml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ spec:
5252
spec:
5353
description: OVNControllerSpec defines the desired state of OVNController
5454
properties:
55+
exporterImage:
56+
description: ExporterImage - Container Image URL for the openstack-network-exporter
57+
metrics daemonset (will be set to environmental default if empty)
58+
type: string
5559
external-ids:
5660
default: {}
5761
description: OVSExternalIDs is a set of configuration options for
@@ -81,6 +85,11 @@ spec:
8185
default: random
8286
type: string
8387
type: object
88+
metricsEnabled:
89+
default: true
90+
description: MetricsEnabled enables the metrics daemonset for collecting
91+
OVN metrics
92+
type: boolean
8493
networkAttachment:
8594
description: |-
8695
NetworkAttachment is a NetworkAttachment resource name to expose the service to the given network.
@@ -263,6 +272,10 @@ spec:
263272
current project
264273
type: string
265274
type: object
275+
metricsNumberReady:
276+
description: MetricsNumberReady of metrics instances
277+
format: int32
278+
type: integer
266279
networkAttachments:
267280
additionalProperties:
268281
items:

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11781,6 +11781,9 @@ spec:
1178111781
default: random
1178211782
type: string
1178311783
type: object
11784+
metricsEnabled:
11785+
default: true
11786+
type: boolean
1178411787
networkAttachment:
1178511788
type: string
1178611789
nicMappings:

‎config/operator/manager_operator_images.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ spec:
4444
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
4545
value: quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:1148bd6f8ff420abb56012407628d97f287265b17b9ac81b358cdfbe6f1eb87b
4646
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
47-
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:913f38aafcad94c46daf2eae66dfa72410aea7652ffe1f34344f5971e75e0dce
47+
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:0ae78d21beb9bbf40bd68a189d925abd20d95bda53318da0852bf9d6f7bdd963
4848
- name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL
4949
value: quay.io/openstack-k8s-operators/placement-operator@sha256:bd227f00edf8b53aa653270a3d15adbbc8258c3e6bf909c0cca8f4c65070548b
5050
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ require (
3333
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-a6da364cfa8e
3434
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb
3535
github.com/openstack-k8s-operators/openstack-operator/apis v0.0.0-20240531084739-3b4c0451297c
36-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538
36+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0
3737
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c
3838
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20250905151959-af12213cc734
3939
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20250904143534-756d992c64fe

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-
140140
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20250825101633-a6da364cfa8e/go.mod h1:cpuJ720zrbnpvvMQLCiwnsS5RJXwHZmzLsigCRhhiIQ=
141141
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb h1:MH2h0C65QhSmVGPMEloufuSuKLR1t193AELvtpicNwE=
142142
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20250828035545-163d345f0ecb/go.mod h1:15x01xs3dolD9G/X+V3kW2EsE4a6/Z/hFgJHcN3Yg9Y=
143-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538 h1:BLMcjUrh2y+u7efuvqFAWpeYyjqZbAcHPhigtnNhitU=
144-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250905123257-bfe70a8d4538/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
143+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0 h1:MI33VHB8oyhCeJLP7S1aYAWL8f4HJoCvq155ThR7bK8=
144+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20250911142534-aca9a3d8b3c0/go.mod h1:K6h5wmoAsxwzq7VSItwMg36RVsexLidHNNuSfK5mbSc=
145145
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c h1:thTQEtjo25kEYW+woLiPpvByMmWkI/jhh+sWokJtLN4=
146146
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20250905081434-85ee919b626c/go.mod h1:qs5IDS8g5krd05ts6sQ+37nP652K7bduJW90j1HMFcc=
147147
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d h1:0KCWljk2IEJ+aWNK+RiGpIdu51KPXrYA5RfyUcV4Mb4=

‎hack/export_operator_related_images.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-op
1515
export RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/nova-operator@sha256:1d198c76f354fb15c60111882c2cca2f8fee4d4893d1785397ed00ee879b0ab9
1616
export RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/octavia-operator@sha256:28e954bf561874e96dd9d376cdfecddb297ac0f165c733327ad55f42d68896c8
1717
export RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/openstack-baremetal-operator@sha256:1148bd6f8ff420abb56012407628d97f287265b17b9ac81b358cdfbe6f1eb87b
18-
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:913f38aafcad94c46daf2eae66dfa72410aea7652ffe1f34344f5971e75e0dce
18+
export RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/ovn-operator@sha256:0ae78d21beb9bbf40bd68a189d925abd20d95bda53318da0852bf9d6f7bdd963
1919
export RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/placement-operator@sha256:bd227f00edf8b53aa653270a3d15adbbc8258c3e6bf909c0cca8f4c65070548b
2020
export RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/rabbitmq-cluster-operator@sha256:225524223bf2a7f3a4ce95958fc9ca6fdab02745fb70374e8ff5bf1ddaceda4b
2121
export RELATED_IMAGE_SWIFT_OPERATOR_MANAGER_IMAGE_URL=quay.io/openstack-k8s-operators/swift-operator@sha256:60aecc02f350443839570b4a7c746daad0d86db91b1216d29339dad0c44e8623

0 commit comments

Comments
 (0)