Skip to content

Commit

Permalink
fix: hopefully last type change
Browse files Browse the repository at this point in the history 
Signed-off-by: David van der Spek <vanderspek.david@gmail.com>
  • Loading branch information
@davidspek
davidspek committed Jul 14, 2023
1 parent 632e10a commit 0a6dcfe
Show file tree
Hide file tree
Showing 4 changed files with 56 additions and 178 deletions.
2 changes: 1 addition & 1 deletion api/observability/v1alpha1/mimir_limit_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ type MimirLimits struct {
// +kubebuilder:validation:Optional
HAMaxClusters *int `yaml:"ha_max_clusters,omitempty" json:"ha_max_clusters,omitempty"`
// +kubebuilder:validation:Optional
DropLabels []*string `yaml:"drop_labels,omitempty" json:"drop_labels,omitempty" category:"advanced"`
DropLabels []string `yaml:"drop_labels,omitempty" json:"drop_labels,omitempty" category:"advanced"`
// +kubebuilder:validation:Optional
MaxLabelNameLength *int `yaml:"max_label_name_length,omitempty" json:"max_label_name_length,omitempty"`
// +kubebuilder:validation:Optional
Expand Down
4 changes: 2 additions & 2 deletions api/observability/v1alpha1/prom_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ type RemoteWriteSpec struct {
// +kubebuilder:validation:Optional
Headers map[string]string `yaml:"headers,omitempty" json:"headers,omitempty"`
// +kubebuilder:validation:Optional
WriteRelabelConfigs []*RelabelConfig `yaml:"write_relabel_configs,omitempty" json:"write_relabel_configs,omitempty"`
WriteRelabelConfigs []RelabelConfig `yaml:"write_relabel_configs,omitempty" json:"write_relabel_configs,omitempty"`
// +kubebuilder:validation:Optional
Name *string `yaml:"name,omitempty" json:"name,omitempty"`
// +kubebuilder:validation:Optional
Expand Down Expand Up @@ -147,7 +147,7 @@ type OAuth2 struct {
// +kubebuilder:validation:Optional
ClientSecretFile *string `yaml:"client_secret_file" json:"client_secret_file"`
// +kubebuilder:validation:Optional
Scopes []*string `yaml:"scopes,omitempty" json:"scopes,omitempty"`
Scopes []string `yaml:"scopes,omitempty" json:"scopes,omitempty"`
// +kubebuilder:validation:Optional
TokenURL *string `yaml:"token_url" json:"token_url"`
// +kubebuilder:validation:Optional
Expand Down
18 changes: 9 additions & 9 deletions api/observability/v1alpha1/tempo_limit_types.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ type TempoLimits struct {

// Forwarders
// +kubebuilder:validation:Optional
Forwarders []*string `yaml:"forwarders,omitempty" json:"forwarders,omitempty"`
Forwarders []string `yaml:"forwarders,omitempty" json:"forwarders,omitempty"`

// Metrics-generator config
// +kubebuilder:validation:Optional
MetricsGeneratorRingSize *int `yaml:"metrics_generator_ring_size,omitempty" json:"metrics_generator_ring_size,omitempty"`
// TODO: ensure the list only contains service-graphs and span-metrics
// +kubebuilder:validation:Optional
MetricsGeneratorProcessors []*string `yaml:"metrics_generator_processors,omitempty" json:"metrics_generator_processors,omitempty"`
MetricsGeneratorProcessors []string `yaml:"metrics_generator_processors,omitempty" json:"metrics_generator_processors,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorMaxActiveSeries *uint32 `yaml:"metrics_generator_max_active_series,omitempty" json:"metrics_generator_max_active_series,omitempty"`
// +kubebuilder:validation:Optional
Expand All @@ -48,23 +48,23 @@ type TempoLimits struct {
// +kubebuilder:validation:Optional
MetricsGeneratorForwarderWorkers *int `yaml:"metrics_generator_forwarder_workers,omitempty" json:"metrics_generator_forwarder_workers,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorServiceGraphsHistogramBuckets []*float64 `yaml:"metrics_generator_processor_service_graphs_histogram_buckets,omitempty" json:"metrics_generator_processor_service_graphs_histogram_buckets,omitempty"`
MetricsGeneratorProcessorServiceGraphsHistogramBuckets []float64 `yaml:"metrics_generator_processor_service_graphs_histogram_buckets,omitempty" json:"metrics_generator_processor_service_graphs_histogram_buckets,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorServiceGraphsDimensions []*string `yaml:"metrics_generator_processor_service_graphs_dimensions,omitempty" json:"metrics_generator_processor_service_graphs_dimensions,omitempty"`
MetricsGeneratorProcessorServiceGraphsDimensions []string `yaml:"metrics_generator_processor_service_graphs_dimensions,omitempty" json:"metrics_generator_processor_service_graphs_dimensions,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorServiceGraphsPeerAttributes []*string `yaml:"metrics_generator_processor_service_graphs_peer_attributes,omitempty" json:"metrics_generator_processor_service_graphs_peer_attributes,omitempty"`
MetricsGeneratorProcessorServiceGraphsPeerAttributes []string `yaml:"metrics_generator_processor_service_graphs_peer_attributes,omitempty" json:"metrics_generator_processor_service_graphs_peer_attributes,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorServiceGraphsEnableClientServerPrefix *bool `yaml:"metrics_generator_processor_service_graphs_enable_client_server_prefix,omitempty" json:"metrics_generator_processor_service_graphs_enable_client_server_prefix,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorSpanMetricsHistogramBuckets []*float64 `yaml:"metrics_generator_processor_span_metrics_histogram_buckets,omitempty" json:"metrics_generator_processor_span_metrics_histogram_buckets,omitempty"`
MetricsGeneratorProcessorSpanMetricsHistogramBuckets []float64 `yaml:"metrics_generator_processor_span_metrics_histogram_buckets,omitempty" json:"metrics_generator_processor_span_metrics_histogram_buckets,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorSpanMetricsDimensions []*string `yaml:"metrics_generator_processor_span_metrics_dimensions,omitempty" json:"metrics_generator_processor_span_metrics_dimensions,omitempty"`
MetricsGeneratorProcessorSpanMetricsDimensions []string `yaml:"metrics_generator_processor_span_metrics_dimensions,omitempty" json:"metrics_generator_processor_span_metrics_dimensions,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorSpanMetricsIntrinsicDimensions map[string]bool `yaml:"metrics_generator_processor_span_metrics_intrinsic_dimensions,omitempty" json:"metrics_generator_processor_span_metrics_intrinsic_dimensions,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorSpanMetricsFilterPolicies []*FilterPolicy `yaml:"metrics_generator_processor_span_metrics_filter_policies,omitempty" json:"metrics_generator_processor_span_metrics_filter_policies,omitempty"`
MetricsGeneratorProcessorSpanMetricsFilterPolicies []FilterPolicy `yaml:"metrics_generator_processor_span_metrics_filter_policies,omitempty" json:"metrics_generator_processor_span_metrics_filter_policies,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorSpanMetricsDimensionMappings []*DimensionMappings `yaml:"metrics_generator_processor_span_metrics_dimension_mappings,omitempty" json:"metrics_generator_processor_span_metrics_dimension_mapings,omitempty"`
MetricsGeneratorProcessorSpanMetricsDimensionMappings []DimensionMappings `yaml:"metrics_generator_processor_span_metrics_dimension_mappings,omitempty" json:"metrics_generator_processor_span_metrics_dimension_mapings,omitempty"`
// +kubebuilder:validation:Optional
MetricsGeneratorProcessorSpanMetricsEnableTargetInfo *bool `yaml:"metrics_generator_processor_span_metrics_enable_target_info,omitempty" json:"metrics_generator_processor_span_metrics_enable_target_info,omitempty"`
// +kubebuilder:validation:Optional
Expand Down
Loading

0 comments on commit 0a6dcfe

Please sign in to comment.