Skip to content

Commit de532de

Browse files
karelyatinkarelyatin
committed
[ovn][metrics] Pass cert secrets
Depends-On: openstack-k8s-operators/ovn-operator#504 Resolves: https://issues.redhat.com/browse/OSPRH-20823 Signed-off-by: Yatin Karel <[email protected]>
1 parent c7bbe1f commit de532de

14 files changed

+142
-20
lines changed

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12116,6 +12116,13 @@ spec:
1211612116
metricsEnabled:
1211712117
default: true
1211812118
type: boolean
12119+
metricsTLS:
12120+
properties:
12121+
caBundleSecretName:
12122+
type: string
12123+
secretName:
12124+
type: string
12125+
type: object
1211912126
networkAttachment:
1212012127
type: string
1212112128
nicMappings:
@@ -12195,6 +12202,13 @@ spec:
1219512202
metricsEnabled:
1219612203
default: true
1219712204
type: boolean
12205+
metricsTLS:
12206+
properties:
12207+
caBundleSecretName:
12208+
type: string
12209+
secretName:
12210+
type: string
12211+
type: object
1219812212
networkAttachment:
1219912213
type: string
1220012214
nodeSelector:
@@ -12323,6 +12337,13 @@ spec:
1232312337
metricsEnabled:
1232412338
default: true
1232512339
type: boolean
12340+
metricsTLS:
12341+
properties:
12342+
caBundleSecretName:
12343+
type: string
12344+
secretName:
12345+
type: string
12346+
type: object
1232612347
nThreads:
1232712348
default: 1
1232812349
format: int32

‎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.20251013072934-e80b840aec1c
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251015074813-c8f83332b774
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251016050458-7c5c8fc69a7a
27-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251015161550-0fa53d55bca0
27+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251020102141-f19d0ee25e0f
2828
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251016091846-46ae39c6d532
2929
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20251016091846-b1f736d575ca
3030
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20251015160727-f7231411e300

‎apis/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251015074813-
150150
github.com/openstack-k8s-operators/octavia-operator/api v0.6.1-0.20251015074813-c8f83332b774/go.mod h1:xmansy+T6LA63HJ6K5PPtO/rgJeOIqB5aY+WGwh538U=
151151
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251016050458-7c5c8fc69a7a h1:AkNf71nz9/k09uRrydFcnIcrjqlPuRP7CD8VU6g5Io4=
152152
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.6.1-0.20251016050458-7c5c8fc69a7a/go.mod h1:He7rGGmvfl1lzn+OJ0jV1tU6b8+otlCCrRx0T3WxlAQ=
153-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251015161550-0fa53d55bca0 h1:YVJsbb3tubDcx8QLbeFrS8+7Rr2uID+X5hKfVkG2dAM=
154-
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251015161550-0fa53d55bca0/go.mod h1:RTW7SRp+Fn8JmIjdOgLl3GB3tTAhnI0q2XgauR1eEUM=
153+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251020102141-f19d0ee25e0f h1:4RH4gFZKRRTjJCLmEbUrQLRWC+wfThHoRapS/nPBbl4=
154+
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20251020102141-f19d0ee25e0f/go.mod h1:RTW7SRp+Fn8JmIjdOgLl3GB3tTAhnI0q2XgauR1eEUM=
155155
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251016091846-46ae39c6d532 h1:Kz2YSBptRCoHu5ie44IJ4rhJ/Unm9Yxdj6wIuv+lc8o=
156156
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20251016091846-46ae39c6d532/go.mod h1:tT7pLlledNe6qxzJPmgG4Vt3y8C8hjlUli0rPBeAiz0=
157157
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=

‎bindata/crds/crds.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12282,6 +12282,13 @@ spec:
1228212282
metricsEnabled:
1228312283
default: true
1228412284
type: boolean
12285+
metricsTLS:
12286+
properties:
12287+
caBundleSecretName:
12288+
type: string
12289+
secretName:
12290+
type: string
12291+
type: object
1228512292
networkAttachment:
1228612293
type: string
1228712294
nicMappings:
@@ -12361,6 +12368,13 @@ spec:
1236112368
metricsEnabled:
1236212369
default: true
1236312370
type: boolean
12371+
metricsTLS:
12372+
properties:
12373+
caBundleSecretName:
12374+
type: string
12375+
secretName:
12376+
type: string
12377+
type: object
1236412378
networkAttachment:
1236512379
type: string
1236612380
nodeSelector:
@@ -12489,6 +12503,13 @@ spec:
1248912503
metricsEnabled:
1249012504
default: true
1249112505
type: boolean
12506+
metricsTLS:
12507+
properties:
12508+
caBundleSecretName:
12509+
type: string
12510+
secretName:
12511+
type: string
12512+
type: object
1249212513
nThreads:
1249312514
default: 1
1249412515
format: int32

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,17 @@ spec:
117117
description: MetricsEnabled enables the metrics daemonset for collecting
118118
OVN metrics
119119
type: boolean
120+
metricsTLS:
121+
description: MetricsTLS - Parameters related to TLS for metrics daemonset
122+
properties:
123+
caBundleSecretName:
124+
description: CaBundleSecretName - holding the CA certs in a pre-created
125+
bundle file
126+
type: string
127+
secretName:
128+
description: SecretName - holding the cert, key for the service
129+
type: string
130+
type: object
120131
networkAttachment:
121132
description: |-
122133
NetworkAttachment is a NetworkAttachment resource name to expose the service to the given network.

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,17 @@ spec:
8585
description: MetricsEnabled enables the metrics sidecar container
8686
for collecting OVN DB metrics
8787
type: boolean
88+
metricsTLS:
89+
description: MetricsTLS - Parameters related to TLS for metrics sidecar
90+
properties:
91+
caBundleSecretName:
92+
description: CaBundleSecretName - holding the CA certs in a pre-created
93+
bundle file
94+
type: string
95+
secretName:
96+
description: SecretName - holding the cert, key for the service
97+
type: string
98+
type: object
8899
networkAttachment:
89100
description: |-
90101
NetworkAttachment is a NetworkAttachment resource name to expose the service to the given network.

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,17 @@ spec:
6565
description: MetricsEnabled enables the metrics sidecar container
6666
for collecting OVN metrics
6767
type: boolean
68+
metricsTLS:
69+
description: MetricsTLS - Parameters related to TLS for metrics sidecar
70+
properties:
71+
caBundleSecretName:
72+
description: CaBundleSecretName - holding the CA certs in a pre-created
73+
bundle file
74+
type: string
75+
secretName:
76+
description: SecretName - holding the cert, key for the service
77+
type: string
78+
type: object
6879
nThreads:
6980
default: 1
7081
description: NThreads sets number of threads used for building logical
@@ -221,6 +232,11 @@ spec:
221232
- type
222233
type: object
223234
type: array
235+
hash:
236+
additionalProperties:
237+
type: string
238+
description: Map of hashes to track e.g. job status
239+
type: object
224240
lastAppliedTopology:
225241
description: LastAppliedTopology - the last applied Topology
226242
properties:

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

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12116,6 +12116,13 @@ spec:
1211612116
metricsEnabled:
1211712117
default: true
1211812118
type: boolean
12119+
metricsTLS:
12120+
properties:
12121+
caBundleSecretName:
12122+
type: string
12123+
secretName:
12124+
type: string
12125+
type: object
1211912126
networkAttachment:
1212012127
type: string
1212112128
nicMappings:
@@ -12195,6 +12202,13 @@ spec:
1219512202
metricsEnabled:
1219612203
default: true
1219712204
type: boolean
12205+
metricsTLS:
12206+
properties:
12207+
caBundleSecretName:
12208+
type: string
12209+
secretName:
12210+
type: string
12211+
type: object
1219812212
networkAttachment:
1219912213
type: string
1220012214
nodeSelector:
@@ -12323,6 +12337,13 @@ spec:
1232312337
metricsEnabled:
1232412338
default: true
1232512339
type: boolean
12340+
metricsTLS:
12341+
properties:
12342+
caBundleSecretName:
12343+
type: string
12344+
secretName:
12345+
type: string
12346+
type: object
1232612347
nThreads:
1232712348
default: 1
1232812349
format: int32

‎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:6f14cbcb71da0fc6f849a4ca8b14a001c6fc62a1b9e78222f0d23f92fd51f5a0
4646
- name: RELATED_IMAGE_OVN_OPERATOR_MANAGER_IMAGE_URL
47-
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:580f4b7128c8e7151bc30730d8c393e06006ea4fc2780132625dbd7f045be74f
47+
value: quay.io/openstack-k8s-operators/ovn-operator@sha256:9ed3e90ad9a4613c6c9c924487006183539b153fc00136ed37b3732f9f6ca2f2
4848
- name: RELATED_IMAGE_PLACEMENT_OPERATOR_MANAGER_IMAGE_URL
4949
value: quay.io/openstack-k8s-operators/placement-operator@sha256:f4ff739c066e6ba873376bd1cdb533b68b8ffa38f0e399b0d315476c05c6b322
5050
- name: RELATED_IMAGE_RABBITMQ_CLUSTER_OPERATOR_MANAGER_IMAGE_URL

‎controllers/core/openstackcontrolplane_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ func (r *OpenStackControlPlaneReconciler) Reconcile(ctx context.Context, req ctr
370370
}
371371

372372
func (r *OpenStackControlPlaneReconciler) reconcileOVNControllers(ctx context.Context, instance *corev1beta1.OpenStackControlPlane, version *corev1beta1.OpenStackVersion, helper *common_helper.Helper) (ctrl.Result, error) {
373-
OVNControllerReady, OVNControllerConditions, err := openstack.ReconcileOVNController(ctx, instance, version, helper)
373+
OVNControllerReady, OVNControllerConditions, err := openstack.ReconcileOVNController(ctx, instance, version, helper, "")
374374
if err != nil {
375375
return ctrl.Result{}, err
376376
} else if !OVNControllerReady {

0 commit comments

Comments
 (0)