Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

OCPBUGS-17487: fix typo for ThanosRulerConfig.Resources #2070

Merged
merged 1 commit into from Aug 9, 2023
Merged

OCPBUGS-17487: fix typo for ThanosRulerConfig.Resources #2070

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Documentation/api.md
View file
Open in desktop
Expand Up @@ -585,7 +585,7 @@ The `ThanosRulerConfig` resource defines configuration for the Thanos Ruler inst
| additionalAlertmanagerConfigs | [][AdditionalAlertmanagerConfig](#additionalalertmanagerconfig) | Configures how the Thanos Ruler component communicates with additional Alertmanager instances. The default value is `nil`. |
| logLevel | string | Defines the log level setting for Thanos Ruler. The possible values are `error`, `warn`, `info`, and `debug`. The default value is `info`. |
| nodeSelector | map[string]string | Defines the nodes on which the Pods are scheduled. |
| resources | *[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core) | Defines resource requests and limits for the Alertmanager container. |
| resources | *[v1.ResourceRequirements](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#resourcerequirements-v1-core) | Defines resource requests and limits for the Thanos Ruler container. |
| retention | string | Defines the duration for which Prometheus retains data. This definition must be specified using the following regular expression pattern: `[0-9]+(ms\|s\|m\|h\|d\|w\|y)` (ms = milliseconds, s= seconds,m = minutes, h = hours, d = days, w = weeks, y = years). The default value is `15d`. |
| tolerations | [][v1.Toleration](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.27/#toleration-v1-core) | Defines tolerations for the pods. |
| topologySpreadConstraints | []v1.TopologySpreadConstraint | Defines topology spread constraints for the pods. |
Expand Down
2 changes: 1 addition & 1 deletion Documentation/openshiftdocs/modules/thanosrulerconfig.adoc
View file
Open in desktop
Expand Up @@ -24,7 +24,7 @@ Appears in: link:userworkloadconfiguration.adoc[UserWorkloadConfiguration]

|nodeSelector|map[string]string|Defines the nodes on which the Pods are scheduled.

|resources|*v1.ResourceRequirements|Defines resource requests and limits for the Alertmanager container.
|resources|*v1.ResourceRequirements|Defines resource requests and limits for the Thanos Ruler container.

|retention|string|Defines the duration for which Prometheus retains data. This definition must be specified using the following regular expression pattern: `[0-9]+(ms\|s\|m\|h\|d\|w\|y)` (ms = milliseconds, s= seconds,m = minutes, h = hours, d = days, w = weeks, y = years). The default value is `15d`.

Expand Down
2 changes: 1 addition & 1 deletion pkg/manifests/types.go
View file
Open in desktop
Expand Up @@ -645,7 +645,7 @@ type ThanosRulerConfig struct {
LogLevel string `json:"logLevel,omitempty"`
// Defines the nodes on which the Pods are scheduled.
NodeSelector map[string]string `json:"nodeSelector,omitempty"`
// Defines resource requests and limits for the Alertmanager container.
// Defines resource requests and limits for the Thanos Ruler container.
Resources *v1.ResourceRequirements `json:"resources,omitempty"`
// Defines the duration for which Prometheus retains data.
// This definition must be specified using the following regular
Expand Down