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

feat(metrics): add setting affinity for metrics collector #3400

Merged
merged 1 commit into from
Nov 14, 2023
Merged

feat(metrics): add setting affinity for metrics collector #3400

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .changelog/3400.added.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
feat(metrics): add setting affinity for metrics collector
1 change: 1 addition & 0 deletions deploy/helm/sumologic/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ The following table lists the configurable parameters of the Sumo Logic chart an
| `sumologic.metrics.collector.otelcol.priorityClassName` | Priority class name for the experimental otelcol metrics. | `null` |
| `sumologic.metrics.collector.otelcol.securityContext` | The securityContext configuration for the experimental otelcol metrics. | `{"fsGroup": 999}` |
| `sumologic.metrics.collector.otelcol.tolerations` | Tolerations for the experimental otelcol metrics. | `[]` |
| `sumologic.metrics.collector.otelcol.affinity` | Affinity for the otelcol metrics collector. | `{}` |
| `sumologic.metrics.enableDefaultFilters` | Enable default metric filters for Sumo Apps. | `false` |
| `sumologic.metrics.collector.otelcol.kubelet.enabled` | Enable collection of kubelet metrics. | `true` |
| `sumologic.metrics.collector.otelcol.cAdvisor.enabled` | Enable collection of cAdvisor metrics. | `true` |
Expand Down
4 changes: 4 additions & 0 deletions deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ spec:
tolerations:
{{ toYaml .Values.sumologic.metrics.collector.otelcol.tolerations | indent 4 }}
{{- end }}
{{- if .Values.sumologic.metrics.collector.otelcol.affinity }}
affinity:
{{ toYaml .Values.sumologic.metrics.collector.otelcol.affinity | indent 4 }}
{{- end }}
{{- if .Values.sumologic.metrics.collector.otelcol.priorityClassName }}
priorityClassName: {{ .Values.sumologic.metrics.collector.otelcol.priorityClassName | quote }}
{{- end }}
Expand Down
2 changes: 2 additions & 0 deletions deploy/helm/sumologic/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,8 @@ sumologic:
fsGroup: 999
tolerations: []

affinity: {}

## Configuration for kubelet metrics
kubelet:
enabled: true
Expand Down
9 changes: 9 additions & 0 deletions tests/helm/testdata/goldenfile/metrics_collector_otc/custom.input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@ sumologic:
- key: null
operator: Exists
effect: "NoSchedule"
affinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: topology.kubernetes.io/zone
operator: In
values:
- sumo-east1
- sumo-west1
securityContext:
fsGroup: 999

Expand Down
9 changes: 9 additions & 0 deletions tests/helm/testdata/goldenfile/metrics_collector_otc/custom.output.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,15 @@ spec:
- effect: NoSchedule
key: null
operator: Exists
affinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: topology.kubernetes.io/zone
operator: In
values:
- sumo-east1
- sumo-west1
priorityClassName: "customPriority"
env:
- name: METADATA_METRICS_SVC
Expand Down