Skip to content

Commit 045e1af

Browse files
vyzigoldvyzigold
committed
Upgrade OBO to v0.3.1
rh-jira: https://issues.redhat.com/browse/OSPRH-10379
1 parent 5e5da43 commit 045e1af

8 files changed

+358
-124
lines changed

‎api/bases/telemetry.openstack.org_metricstorages.yaml

+76-18
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,11 @@ spec:
112112
replicas: 2
113113
description: Define prometheus config
114114
properties:
115+
enableOtlpHttpReceiver:
116+
description: Enable Prometheus to accept OpenTelemetry Metrics
117+
via the otlp/http protocol. Defaults to the value of `false`.
118+
The resulting endpoint is /api/v1/otlp/v1/metrics.
119+
type: boolean
115120
enableRemoteWriteReceiver:
116121
description: Enable Prometheus to be used as a receiver for
117122
the Prometheus remote write protocol. Defaults to the value
@@ -390,25 +395,72 @@ spec:
390395
type: string
391396
managedIdentity:
392397
description: ManagedIdentity defines the Azure User-assigned
393-
Managed identity.
398+
Managed identity. Cannot be set at the same time
399+
as `oauth`.
394400
properties:
395401
clientId:
396402
description: The client id
397403
type: string
398404
required:
399405
- clientId
400406
type: object
401-
required:
402-
- managedIdentity
407+
oauth:
408+
description: "OAuth defines the oauth config that
409+
is being used to authenticate. Cannot be set at
410+
the same time as `managedIdentity`. \n It requires
411+
Prometheus >= v2.48.0."
412+
properties:
413+
clientId:
414+
description: '`clientID` is the clientId of
415+
the Azure Active Directory application that
416+
is being used to authenticate.'
417+
minLength: 1
418+
type: string
419+
clientSecret:
420+
description: '`clientSecret` specifies a key
421+
of a Secret containing the client secret of
422+
the Azure Active Directory application that
423+
is being used to authenticate.'
424+
properties:
425+
key:
426+
description: The key of the secret to select
427+
from. Must be a valid secret key.
428+
type: string
429+
name:
430+
description: 'Name of the referent. More
431+
info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
432+
TODO: Add other useful fields. apiVersion,
433+
kind, uid?'
434+
type: string
435+
optional:
436+
description: Specify whether the Secret
437+
or its key must be defined
438+
type: boolean
439+
required:
440+
- key
441+
type: object
442+
x-kubernetes-map-type: atomic
443+
tenantId:
444+
description: '`tenantID` is the tenant ID of
445+
the Azure Active Directory application that
446+
is being used to authenticate.'
447+
minLength: 1
448+
pattern: ^[0-9a-zA-Z-.]+$
449+
type: string
450+
required:
451+
- clientId
452+
- clientSecret
453+
- tenantId
454+
type: object
403455
type: object
404456
basicAuth:
405457
description: "BasicAuth configuration for the URL. \n
406458
Cannot be set at the same time as `sigv4`, `authorization`,
407459
`oauth2`, or `azureAd`."
408460
properties:
409461
password:
410-
description: The secret in the service monitor namespace
411-
that contains the password for authentication.
462+
description: '`password` specifies a key of a Secret
463+
containing the password for authentication.'
412464
properties:
413465
key:
414466
description: The key of the secret to select
@@ -429,8 +481,8 @@ spec:
429481
type: object
430482
x-kubernetes-map-type: atomic
431483
username:
432-
description: The secret in the service monitor namespace
433-
that contains the username for authentication.
484+
description: '`username` specifies a key of a Secret
485+
containing the username for authentication.'
434486
properties:
435487
key:
436488
description: The key of the secret to select
@@ -454,14 +506,17 @@ spec:
454506
bearerToken:
455507
description: "*Warning: this field shouldn't be used
456508
because the token value appears in clear-text. Prefer
457-
using `authorization`.* \n *Deprecated: this will
458-
be removed in a future release.*"
509+
using `authorization`.* \n Deprecated: this will be
510+
removed in a future release."
459511
type: string
460512
bearerTokenFile:
461513
description: "File from which to read bearer token for
462-
the URL. \n *Deprecated: this will be removed in a
463-
future release. Prefer using `authorization`.*"
514+
the URL. \n Deprecated: this will be removed in a
515+
future release. Prefer using `authorization`."
464516
type: string
517+
enableHTTP2:
518+
description: Whether to enable HTTP2.
519+
type: boolean
465520
headers:
466521
additionalProperties:
467522
type: string
@@ -497,8 +552,8 @@ spec:
497552
or `azureAd`."
498553
properties:
499554
clientId:
500-
description: The secret or configmap containing
501-
the OAuth2 client id
555+
description: '`clientId` specifies a key of a Secret
556+
or ConfigMap containing the OAuth2 client''s ID.'
502557
properties:
503558
configMap:
504559
description: ConfigMap containing data to use
@@ -545,8 +600,8 @@ spec:
545600
x-kubernetes-map-type: atomic
546601
type: object
547602
clientSecret:
548-
description: The secret containing the OAuth2 client
549-
secret
603+
description: '`clientSecret` specifies a key of
604+
a Secret containing the OAuth2 client''s secret.'
550605
properties:
551606
key:
552607
description: The key of the secret to select
@@ -569,15 +624,18 @@ spec:
569624
endpointParams:
570625
additionalProperties:
571626
type: string
572-
description: Parameters to append to the token URL
627+
description: '`endpointParams` configures the HTTP
628+
parameters to append to the token URL.'
573629
type: object
574630
scopes:
575-
description: OAuth2 scopes used for the token request
631+
description: '`scopes` defines the OAuth2 scopes
632+
used for the token request.'
576633
items:
577634
type: string
578635
type: array
579636
tokenUrl:
580-
description: The URL to fetch the token from
637+
description: '`tokenURL` configures the URL to fetch
638+
the token from.'
581639
minLength: 1
582640
type: string
583641
required:

0 commit comments

Comments
 (0)