Skip to content

Commit

Permalink
Add ARM64 tolerations to alloy, ksm, and opencost (#717)
Browse files Browse the repository at this point in the history
Signed-off-by: Pete Wall <pete.wall@grafana.com>
  • Loading branch information
petewall authored Sep 5, 2024
1 parent 1f242e8 commit b5d7374
Show file tree
Hide file tree
Showing 34 changed files with 781 additions and 5 deletions.
2 changes: 1 addition & 1 deletion charts/k8s-monitoring/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ The Prometheus and Loki services may be hosted on the same cluster, or remotely
| configValidator.extraLabels | object | `{}` | Extra labels to add to the test config validator job. |
| configValidator.nodeSelector | object | `{"kubernetes.io/os":"linux"}` | nodeSelector to apply to the config validator job. |
| configValidator.serviceAccount | object | `{"name":""}` | Service Account to use for the config validator job. |
| configValidator.tolerations | list | `[]` | Tolerations to apply to the config validator job. |
| configValidator.tolerations | list | `[{"effect":"NoSchedule","key":"kubernetes.io/arch","operator":"Equal","value":"arm64"}]` | Tolerations to apply to the config validator job. |

### External Services (Loki)

Expand Down
39 changes: 35 additions & 4 deletions charts/k8s-monitoring/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1990,6 +1990,14 @@ configValidator:
nodeSelector:
kubernetes.io/os: linux

# -- Tolerations to apply to the config validator job.
# @section -- Config Validator Job
tolerations:
- key: "kubernetes.io/arch"
operator: "Equal"
value: "arm64"
effect: "NoSchedule"

# -- Extra annotations to add to the test config validator job.
# @section -- Config Validator Job
extraAnnotations: {}
Expand All @@ -1998,10 +2006,6 @@ configValidator:
# @section -- Config Validator Job
extraLabels: {}

# -- Tolerations to apply to the config validator job.
# @section -- Config Validator Job
tolerations: []

# -- Service Account to use for the config validator job.
# @section -- Config Validator Job
serviceAccount:
Expand Down Expand Up @@ -2135,6 +2139,13 @@ kube-state-metrics:
nodeSelector:
kubernetes.io/os: linux

# @ignored
tolerations:
- key: "kubernetes.io/arch"
operator: "Equal"
value: "arm64"
effect: "NoSchedule"

# @ignored - Enable the release label
releaseLabel: true

Expand Down Expand Up @@ -2288,6 +2299,13 @@ opencost:
nodeSelector:
kubernetes.io/os: linux

# @ignored -- This skips including these values in README.md
tolerations:
- key: "kubernetes.io/arch"
operator: "Equal"
value: "arm64"
effect: "NoSchedule"

# Settings for the Kepler deployment
# You can use this sections to make modifications to the Kepler deployment.
# See https://github.com/sustainable-computing-io/kepler-helm-chart/tree/main/chart/kepler for available values.
Expand Down Expand Up @@ -2407,9 +2425,16 @@ alloy:
# @ignored
controller:
type: statefulset

nodeSelector:
kubernetes.io/os: linux

tolerations:
- key: "kubernetes.io/arch"
operator: "Equal"
value: "arm64"
effect: "NoSchedule"

podAnnotations:
k8s.grafana.com/logs.job: integrations/alloy

Expand Down Expand Up @@ -2449,6 +2474,12 @@ alloy-events:
nodeSelector:
kubernetes.io/os: linux

tolerations:
- key: "kubernetes.io/arch"
operator: "Equal"
value: "arm64"
effect: "NoSchedule"

podAnnotations:
k8s.grafana.com/logs.job: integrations/alloy

Expand Down
25 changes: 25 additions & 0 deletions examples/alloy-autoscaling-and-storage/output.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions examples/application-observability/output.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions examples/azure-aks/output.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions examples/bearer-token-auth/output.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

25 changes: 25 additions & 0 deletions examples/beyla/output.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b5d7374

Please sign in to comment.