From 58e2e2ade3232c05c34b3d02dc9778fa4962d494 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 11:11:18 +0100 Subject: [PATCH] Bump github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring (#492) Bumps [github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring](https://github.com/prometheus-operator/prometheus-operator) from 0.68.0 to 0.69.1. - [Release notes](https://github.com/prometheus-operator/prometheus-operator/releases) - [Changelog](https://github.com/prometheus-operator/prometheus-operator/blob/main/CHANGELOG.md) - [Commits](https://github.com/prometheus-operator/prometheus-operator/compare/v0.68.0...v0.69.1) --- updated-dependencies: - dependency-name: github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 +- .../apis/monitoring/v1/alertmanager_types.go | 14 +++- .../apis/monitoring/v1/prometheus_types.go | 78 +++++++++++++++---- .../pkg/apis/monitoring/v1/thanos_types.go | 13 +++- .../monitoring/v1/zz_generated.deepcopy.go | 46 +++++++++++ vendor/modules.txt | 2 +- 7 files changed, 134 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index a073ec720..229f13dd8 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,7 @@ require ( github.com/onsi/ginkgo/v2 v2.13.1 github.com/onsi/gomega v1.30.0 github.com/openshift/api v0.0.0-20220112145620-704957ce4980 - github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0 + github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.69.1 github.com/prometheus/common v0.44.0 github.com/stretchr/testify v1.8.4 go.uber.org/zap v1.26.0 diff --git a/go.sum b/go.sum index b4b971a29..be6e05ca7 100644 --- a/go.sum +++ b/go.sum @@ -181,8 +181,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0 h1:yl9ceUSUBo9woQIO+8eoWpcxZkdZgm89g+rVvu37TUw= -github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0/go.mod h1:9Uuu3pEU2jB8PwuqkHvegQ0HV/BlZRJUyfTYAqfdVF8= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.69.1 h1:hOnp+1FLBm+ifsyiRbunmfSs99jKAq+Tr5elCmo5l5U= +github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.69.1/go.mod h1:JtflYMUMay9HGil4aRg+dSj6X6mngtuBJf/ULOCxbxI= github.com/prometheus/client_golang v1.17.0 h1:rl2sfwZMtSthVU752MqfjQozy7blglC+1SOtjMAMh+Q= github.com/prometheus/client_golang v1.17.0/go.mod h1:VeL+gMmOAxkS2IqfCq0ZmHSL+LjWfWDUmp1mBz9JgUY= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/alertmanager_types.go b/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/alertmanager_types.go index 9bcbf3207..78815919f 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/alertmanager_types.go +++ b/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/alertmanager_types.go @@ -60,7 +60,15 @@ func (l *Alertmanager) DeepCopyObject() runtime.Object { // https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#spec-and-status // +k8s:openapi-gen=true type AlertmanagerSpec struct { - // PodMetadata configures Labels and Annotations which are propagated to the alertmanager pods. + // PodMetadata configures labels and annotations which are propagated to the Alertmanager pods. + // + // The following items are reserved and cannot be overridden: + // * "alertmanager" label, set to the name of the Alertmanager instance. + // * "app.kubernetes.io/instance" label, set to the name of the Alertmanager instance. + // * "app.kubernetes.io/managed-by" label, set to "prometheus-operator". + // * "app.kubernetes.io/name" label, set to "alertmanager". + // * "app.kubernetes.io/version" label, set to the Alertmanager version. + // * "kubectl.kubernetes.io/default-container" annotation, set to "alertmanager". PodMetadata *EmbeddedObjectMetadata `json:"podMetadata,omitempty"` // Image if specified has precedence over baseImage, tag and sha // combinations. Specifying the version is still necessary to ensure the @@ -115,10 +123,10 @@ type AlertmanagerSpec struct { // receiver (effectively dropping alert notifications). ConfigSecret string `json:"configSecret,omitempty"` // Log level for Alertmanager to be configured with. - //+kubebuilder:validation:Enum="";debug;info;warn;error + // +kubebuilder:validation:Enum="";debug;info;warn;error LogLevel string `json:"logLevel,omitempty"` // Log format for Alertmanager to be configured with. - //+kubebuilder:validation:Enum="";logfmt;json + // +kubebuilder:validation:Enum="";logfmt;json LogFormat string `json:"logFormat,omitempty"` // Size is the expected size of the alertmanager cluster. The controller will // eventually make the size of the running cluster equal to the expected diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/prometheus_types.go b/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/prometheus_types.go index 7dc956109..fff9bf06d 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/prometheus_types.go +++ b/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/prometheus_types.go @@ -60,6 +60,16 @@ func (l *Prometheus) GetStatus() PrometheusStatus { // +k8s:deepcopy-gen=true type CommonPrometheusFields struct { // PodMetadata configures labels and annotations which are propagated to the Prometheus pods. + // + // The following items are reserved and cannot be overridden: + // * "prometheus" label, set to the name of the Prometheus object. + // * "app.kubernetes.io/instance" label, set to the name of the Prometheus object. + // * "app.kubernetes.io/managed-by" label, set to "prometheus-operator". + // * "app.kubernetes.io/name" label, set to "prometheus". + // * "app.kubernetes.io/version" label, set to the Prometheus version. + // * "operator.prometheus.io/name" label, set to the name of the Prometheus object. + // * "operator.prometheus.io/shard" label, set to the shard number of the Prometheus object. + // * "kubectl.kubernetes.io/default-container" annotation, set to "prometheus". PodMetadata *EmbeddedObjectMetadata `json:"podMetadata,omitempty"` // ServiceMonitors to be selected for target discovery. An empty label @@ -205,10 +215,10 @@ type CommonPrometheusFields struct { PrometheusExternalLabelName *string `json:"prometheusExternalLabelName,omitempty"` // Log level for Prometheus and the config-reloader sidecar. - //+kubebuilder:validation:Enum="";debug;info;warn;error + // +kubebuilder:validation:Enum="";debug;info;warn;error LogLevel string `json:"logLevel,omitempty"` // Log format for Log level for Prometheus and the config-reloader sidecar. - //+kubebuilder:validation:Enum="";logfmt;json + // +kubebuilder:validation:Enum="";logfmt;json LogFormat string `json:"logFormat,omitempty"` // Interval between consecutive scrapes. @@ -302,7 +312,7 @@ type CommonPrometheusFields struct { // +optional Tolerations []v1.Toleration `json:"tolerations,omitempty"` // Defines the pod's topology spread constraints if specified. - //+optional + // +optional TopologySpreadConstraints []v1.TopologySpreadConstraint `json:"topologySpreadConstraints,omitempty"` // Defines the list of remote write configurations. @@ -407,7 +417,7 @@ type CommonPrometheusFields struct { // When true, `spec.namespaceSelector` from all PodMonitor, ServiceMonitor // and Probe objects will be ignored. They will only discover targets // within the namespace of the PodMonitor, ServiceMonitor and Probe - // objec. + // object. IgnoreNamespaceSelectors bool `json:"ignoreNamespaceSelectors,omitempty"` // When not empty, a label will be added to @@ -787,7 +797,7 @@ type PrometheusSpec struct { type PrometheusTracingConfig struct { // Client used to export the traces. Supported values are `http` or `grpc`. - //+kubebuilder:validation:Enum=http;grpc + // +kubebuilder:validation:Enum=http;grpc // +optional ClientType *string `json:"clientType"` @@ -809,7 +819,7 @@ type PrometheusTracingConfig struct { Headers map[string]string `json:"headers"` // Compression key for supported compression types. The only supported value is `gzip`. - //+kubebuilder:validation:Enum=gzip + // +kubebuilder:validation:Enum=gzip // +optional Compression *string `json:"compression"` @@ -1023,10 +1033,10 @@ type ThanosSpec struct { GRPCServerTLSConfig *TLSConfig `json:"grpcServerTlsConfig,omitempty"` // Log level for the Thanos sidecar. - //+kubebuilder:validation:Enum="";debug;info;warn;error + // +kubebuilder:validation:Enum="";debug;info;warn;error LogLevel string `json:"logLevel,omitempty"` // Log format for the Thanos sidecar. - //+kubebuilder:validation:Enum="";logfmt;json + // +kubebuilder:validation:Enum="";logfmt;json LogFormat string `json:"logFormat,omitempty"` // Defines the start of time range limit served by the Thanos sidecar's StoreAPI. @@ -1121,12 +1131,12 @@ type RemoteWriteSpec struct { // // It requires Prometheus >= v2.27.0. // - // Cannot be set at the same time as `sigv4`, `authorization`, or `basicAuth`. + // Cannot be set at the same time as `sigv4`, `authorization`, `basicAuth`, or `azureAd`. // +optional OAuth2 *OAuth2 `json:"oauth2,omitempty"` // BasicAuth configuration for the URL. // - // Cannot be set at the same time as `sigv4`, `authorization`, or `oauth2`. + // Cannot be set at the same time as `sigv4`, `authorization`, `oauth2`, or `azureAd`. // // +optional BasicAuth *BasicAuth `json:"basicAuth,omitempty"` @@ -1138,7 +1148,7 @@ type RemoteWriteSpec struct { // // It requires Prometheus >= v2.26.0. // - // Cannot be set at the same time as `sigv4`, `basicAuth`, or `oauth2`. + // Cannot be set at the same time as `sigv4`, `basicAuth`, `oauth2`, or `azureAd`. // // +optional Authorization *Authorization `json:"authorization,omitempty"` @@ -1146,11 +1156,20 @@ type RemoteWriteSpec struct { // // It requires Prometheus >= v2.26.0. // - // Cannot be set at the same time as `authorization`, `basicAuth`, or `oauth2`. + // Cannot be set at the same time as `authorization`, `basicAuth`, `oauth2`, or `azureAd`. // // +optional Sigv4 *Sigv4 `json:"sigv4,omitempty"` + // AzureAD for the URL. + // + // It requires Prometheus >= v2.45.0. + // + // Cannot be set at the same time as `authorization`, `basicAuth`, `oauth2`, or `sigv4`. + // + // +optional + AzureAD *AzureAD `json:"azureAd,omitempty"` + // *Warning: this field shouldn't be used because the token value appears // in clear-text. Prefer using `authorization`.* // @@ -1219,6 +1238,26 @@ type Sigv4 struct { RoleArn string `json:"roleArn,omitempty"` } +// AzureAD defines the configuration for remote write's azuread parameters. +// +k8s:openapi-gen=true +type AzureAD struct { + // The Azure Cloud. Options are 'AzurePublic', 'AzureChina', or 'AzureGovernment'. + // +kubebuilder:validation:Enum=AzureChina;AzureGovernment;AzurePublic + // +optional + Cloud *string `json:"cloud,omitempty"` + // ManagedIdentity defines the Azure User-assigned Managed identity. + // +required + ManagedIdentity ManagedIdentity `json:"managedIdentity"` +} + +// ManagedIdentity defines the Azure User-assigned Managed identity. +// +k8s:openapi-gen=true +type ManagedIdentity struct { + // The client id + // +required + ClientID string `json:"clientId"` +} + // RemoteReadSpec defines the configuration for Prometheus to read back samples // from a remote endpoint. // +k8s:openapi-gen=true @@ -1428,25 +1467,34 @@ type AlertmanagerEndpoints struct { // BasicAuth configuration for Alertmanager. // - // Cannot be set at the same time as `bearerTokenFile`, or `authorization`. + // Cannot be set at the same time as `bearerTokenFile`, `authorization` or `sigv4`. // // +optional BasicAuth *BasicAuth `json:"basicAuth,omitempty"` // File to read bearer token for Alertmanager. // - // Cannot be set at the same time as `basicAuth`, or `authorization`. + // Cannot be set at the same time as `basicAuth`, `authorization`, or `sigv4`. // // *Deprecated: this will be removed in a future release. Prefer using `authorization`.* BearerTokenFile string `json:"bearerTokenFile,omitempty"` // Authorization section for Alertmanager. // - // Cannot be set at the same time as `basicAuth`, or `bearerTokenFile`. + // Cannot be set at the same time as `basicAuth`, `bearerTokenFile` or `sigv4`. // // +optional Authorization *SafeAuthorization `json:"authorization,omitempty"` + // Sigv4 allows to configures AWS's Signature Verification 4 for the URL. + // + // It requires Prometheus >= v2.48.0. + // + // Cannot be set at the same time as `basicAuth`, `bearerTokenFile` or `authorization`. + // + // +optional + Sigv4 *Sigv4 `json:"sigv4,omitempty"` + // Version of the Alertmanager API that Prometheus uses to send alerts. // It can be "v1" or "v2". APIVersion string `json:"apiVersion,omitempty"` diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/thanos_types.go b/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/thanos_types.go index 6310b623b..c155df068 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/thanos_types.go +++ b/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/thanos_types.go @@ -68,7 +68,14 @@ type ThanosRulerList struct { type ThanosRulerSpec struct { // Version of Thanos to be deployed. Version string `json:"version,omitempty"` - // PodMetadata contains Labels and Annotations gets propagated to the thanos ruler pods. + // PodMetadata configures labels and annotations which are propagated to the ThanosRuler pods. + // + // The following items are reserved and cannot be overridden: + // * "app.kubernetes.io/name" label, set to "thanos-ruler". + // * "app.kubernetes.io/managed-by" label, set to "prometheus-operator". + // * "app.kubernetes.io/instance" label, set to the name of the ThanosRuler instance. + // * "thanos-ruler" label, set to the name of the ThanosRuler instance. + // * "kubectl.kubernetes.io/default-container" annotation, set to "thanos-ruler". PodMetadata *EmbeddedObjectMetadata `json:"podMetadata,omitempty"` // Thanos container image URL. Image string `json:"image,omitempty"` @@ -158,10 +165,10 @@ type ThanosRulerSpec struct { // Deprecated: use excludedFromEnforcement instead. PrometheusRulesExcludedFromEnforce []PrometheusRuleExcludeConfig `json:"prometheusRulesExcludedFromEnforce,omitempty"` // Log level for ThanosRuler to be configured with. - //+kubebuilder:validation:Enum="";debug;info;warn;error + // +kubebuilder:validation:Enum="";debug;info;warn;error LogLevel string `json:"logLevel,omitempty"` // Log format for ThanosRuler to be configured with. - //+kubebuilder:validation:Enum="";logfmt;json + // +kubebuilder:validation:Enum="";logfmt;json LogFormat string `json:"logFormat,omitempty"` // Port name used for the pods and governing service. // Defaults to `web`. diff --git a/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/zz_generated.deepcopy.go b/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/zz_generated.deepcopy.go index 5f85b15fc..101879d8e 100644 --- a/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/zz_generated.deepcopy.go +++ b/vendor/github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1/zz_generated.deepcopy.go @@ -157,6 +157,11 @@ func (in *AlertmanagerEndpoints) DeepCopyInto(out *AlertmanagerEndpoints) { *out = new(SafeAuthorization) (*in).DeepCopyInto(*out) } + if in.Sigv4 != nil { + in, out := &in.Sigv4, &out.Sigv4 + *out = new(Sigv4) + (*in).DeepCopyInto(*out) + } if in.Timeout != nil { in, out := &in.Timeout, &out.Timeout *out = new(Duration) @@ -525,6 +530,27 @@ func (in *AuthorizationValidationError) DeepCopy() *AuthorizationValidationError return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *AzureAD) DeepCopyInto(out *AzureAD) { + *out = *in + if in.Cloud != nil { + in, out := &in.Cloud, &out.Cloud + *out = new(string) + **out = **in + } + out.ManagedIdentity = in.ManagedIdentity +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new AzureAD. +func (in *AzureAD) DeepCopy() *AzureAD { + if in == nil { + return nil + } + out := new(AzureAD) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *BasicAuth) DeepCopyInto(out *BasicAuth) { *out = *in @@ -1170,6 +1196,21 @@ func (in *HostPort) DeepCopy() *HostPort { return out } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *ManagedIdentity) DeepCopyInto(out *ManagedIdentity) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ManagedIdentity. +func (in *ManagedIdentity) DeepCopy() *ManagedIdentity { + if in == nil { + return nil + } + out := new(ManagedIdentity) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MetadataConfig) DeepCopyInto(out *MetadataConfig) { *out = *in @@ -2236,6 +2277,11 @@ func (in *RemoteWriteSpec) DeepCopyInto(out *RemoteWriteSpec) { *out = new(Sigv4) (*in).DeepCopyInto(*out) } + if in.AzureAD != nil { + in, out := &in.AzureAD, &out.AzureAD + *out = new(AzureAD) + (*in).DeepCopyInto(*out) + } if in.TLSConfig != nil { in, out := &in.TLSConfig, &out.TLSConfig *out = new(TLSConfig) diff --git a/vendor/modules.txt b/vendor/modules.txt index d6b5a9dfc..90adc43c5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -164,7 +164,7 @@ github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 ## explicit github.com/pmezard/go-difflib/difflib -# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0 +# github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.69.1 ## explicit; go 1.17 github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1