Skip to content

Commit

Permalink
chore: update to prometheus-operator v0.71.0 (#402)
Browse files Browse the repository at this point in the history 
Signed-off-by: Jan Fajerski <[email protected]>
  • Loading branch information
@jan--f
jan--f authored Jan 22, 2024
1 parent c0f54ae commit aae84ba
Show file tree
Hide file tree
Showing 7 changed files with 318 additions and 180 deletions.
87 changes: 70 additions & 17 deletions bundle/manifests/monitoring.rhobs_monitoringstacks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,25 +378,72 @@ spec:
type: string
managedIdentity:
description: ManagedIdentity defines the Azure User-assigned
Managed identity.
Managed identity. Cannot be set at the same time as
`oauth`.
properties:
clientId:
description: The client id
type: string
required:
- clientId
type: object
required:
- managedIdentity
oauth:
description: "OAuth defines the oauth config that is
being used to authenticate. Cannot be set at the same
time as `managedIdentity`. \n It requires Prometheus
>= v2.48.0."
properties:
clientId:
description: '`clientID` is the clientId of the
Azure Active Directory application that is being
used to authenticate.'
minLength: 1
type: string
clientSecret:
description: '`clientSecret` specifies a key of
a Secret containing the client secret of the Azure
Active Directory application that is being used
to authenticate.'
properties:
key:
description: The key of the secret to select
from. Must be a valid secret key.
type: string
name:
description: 'Name of the referent. More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion,
kind, uid?'
type: string
optional:
description: Specify whether the Secret or its
key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
tenantId:
description: '`tenantID` is the tenant ID of the
Azure Active Directory application that is being
used to authenticate.'
minLength: 1
pattern: ^[0-9a-zA-Z-.]+$
type: string
required:
- clientId
- clientSecret
- tenantId
type: object
type: object
basicAuth:
description: "BasicAuth configuration for the URL. \n Cannot
be set at the same time as `sigv4`, `authorization`, `oauth2`,
or `azureAd`."
properties:
password:
description: The secret in the service monitor namespace
that contains the password for authentication.
description: '`password` specifies a key of a Secret
containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must
Expand All @@ -416,8 +463,8 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
description: The secret in the service monitor namespace
that contains the username for authentication.
description: '`username` specifies a key of a Secret
containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must
Expand All @@ -440,13 +487,16 @@ spec:
bearerToken:
description: "*Warning: this field shouldn't be used because
the token value appears in clear-text. Prefer using `authorization`.*
\n *Deprecated: this will be removed in a future release.*"
\n Deprecated: this will be removed in a future release."
type: string
bearerTokenFile:
description: "File from which to read bearer token for the
URL. \n *Deprecated: this will be removed in a future
release. Prefer using `authorization`.*"
URL. \n Deprecated: this will be removed in a future release.
Prefer using `authorization`."
type: string
enableHTTP2:
description: Whether to enable HTTP2.
type: boolean
headers:
additionalProperties:
type: string
Expand Down Expand Up @@ -481,8 +531,8 @@ spec:
as `sigv4`, `authorization`, `basicAuth`, or `azureAd`."
properties:
clientId:
description: The secret or configmap containing the
OAuth2 client id
description: '`clientId` specifies a key of a Secret
or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for
Expand Down Expand Up @@ -529,8 +579,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
description: The secret containing the OAuth2 client
secret
description: '`clientSecret` specifies a key of a Secret
containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must
Expand All @@ -552,15 +602,18 @@ spec:
endpointParams:
additionalProperties:
type: string
description: Parameters to append to the token URL
description: '`endpointParams` configures the HTTP parameters
to append to the token URL.'
type: object
scopes:
description: OAuth2 scopes used for the token request
description: '`scopes` defines the OAuth2 scopes used
for the token request.'
items:
type: string
type: array
tokenUrl:
description: The URL to fetch the token from
description: '`tokenURL` configures the URL to fetch
the token from.'
minLength: 1
type: string
required:
Expand Down
2 changes: 1 addition & 1 deletion bundle/manifests/observability-operator.clusterserviceversion.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ metadata:
categories: Monitoring
certified: "false"
containerImage: observability-operator:0.0.28
createdAt: "2024-01-03T19:02:56Z"
createdAt: "2024-01-18T19:29:31Z"
description: A Go based Kubernetes operator to setup and manage highly available
Monitoring Stack using Prometheus, Alertmanager and Thanos Querier.
operators.operatorframework.io/builder: operator-sdk-v1.31.0
Expand Down
87 changes: 70 additions & 17 deletions deploy/crds/common/monitoring.rhobs_monitoringstacks.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -379,25 +379,72 @@ spec:
type: string
managedIdentity:
description: ManagedIdentity defines the Azure User-assigned
Managed identity.
Managed identity. Cannot be set at the same time as
`oauth`.
properties:
clientId:
description: The client id
type: string
required:
- clientId
type: object
required:
- managedIdentity
oauth:
description: "OAuth defines the oauth config that is
being used to authenticate. Cannot be set at the same
time as `managedIdentity`. \n It requires Prometheus
>= v2.48.0."
properties:
clientId:
description: '`clientID` is the clientId of the
Azure Active Directory application that is being
used to authenticate.'
minLength: 1
type: string
clientSecret:
description: '`clientSecret` specifies a key of
a Secret containing the client secret of the Azure
Active Directory application that is being used
to authenticate.'
properties:
key:
description: The key of the secret to select
from. Must be a valid secret key.
type: string
name:
description: 'Name of the referent. More info:
https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
TODO: Add other useful fields. apiVersion,
kind, uid?'
type: string
optional:
description: Specify whether the Secret or its
key must be defined
type: boolean
required:
- key
type: object
x-kubernetes-map-type: atomic
tenantId:
description: '`tenantID` is the tenant ID of the
Azure Active Directory application that is being
used to authenticate.'
minLength: 1
pattern: ^[0-9a-zA-Z-.]+$
type: string
required:
- clientId
- clientSecret
- tenantId
type: object
type: object
basicAuth:
description: "BasicAuth configuration for the URL. \n Cannot
be set at the same time as `sigv4`, `authorization`, `oauth2`,
or `azureAd`."
properties:
password:
description: The secret in the service monitor namespace
that contains the password for authentication.
description: '`password` specifies a key of a Secret
containing the password for authentication.'
properties:
key:
description: The key of the secret to select from. Must
Expand All @@ -417,8 +464,8 @@ spec:
type: object
x-kubernetes-map-type: atomic
username:
description: The secret in the service monitor namespace
that contains the username for authentication.
description: '`username` specifies a key of a Secret
containing the username for authentication.'
properties:
key:
description: The key of the secret to select from. Must
Expand All @@ -441,13 +488,16 @@ spec:
bearerToken:
description: "*Warning: this field shouldn't be used because
the token value appears in clear-text. Prefer using `authorization`.*
\n *Deprecated: this will be removed in a future release.*"
\n Deprecated: this will be removed in a future release."
type: string
bearerTokenFile:
description: "File from which to read bearer token for the
URL. \n *Deprecated: this will be removed in a future
release. Prefer using `authorization`.*"
URL. \n Deprecated: this will be removed in a future release.
Prefer using `authorization`."
type: string
enableHTTP2:
description: Whether to enable HTTP2.
type: boolean
headers:
additionalProperties:
type: string
Expand Down Expand Up @@ -482,8 +532,8 @@ spec:
as `sigv4`, `authorization`, `basicAuth`, or `azureAd`."
properties:
clientId:
description: The secret or configmap containing the
OAuth2 client id
description: '`clientId` specifies a key of a Secret
or ConfigMap containing the OAuth2 client''s ID.'
properties:
configMap:
description: ConfigMap containing data to use for
Expand Down Expand Up @@ -530,8 +580,8 @@ spec:
x-kubernetes-map-type: atomic
type: object
clientSecret:
description: The secret containing the OAuth2 client
secret
description: '`clientSecret` specifies a key of a Secret
containing the OAuth2 client''s secret.'
properties:
key:
description: The key of the secret to select from. Must
Expand All @@ -553,15 +603,18 @@ spec:
endpointParams:
additionalProperties:
type: string
description: Parameters to append to the token URL
description: '`endpointParams` configures the HTTP parameters
to append to the token URL.'
type: object
scopes:
description: OAuth2 scopes used for the token request
description: '`scopes` defines the OAuth2 scopes used
for the token request.'
items:
type: string
type: array
tokenUrl:
description: The URL to fetch the token from
description: '`tokenURL` configures the URL to fetch
the token from.'
minLength: 1
type: string
required:
Expand Down
Loading

0 comments on commit aae84ba

Please sign in to comment.