Skip to content

Commit 6595ebf

Browse files
committed
Add support to custom affinity
1 parent ccc0205 commit 6595ebf

4 files changed

Lines changed: 14 additions & 3 deletions

File tree

docs_src/tutorials/kubernetes.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@ to be installed from the source code.
2525
| `serviceMonitor.relabelings` | Allow to add extra labels to metrics | Add node metrics |
2626

2727
#### Other parameters
28-
| Name | Description | Value |
29-
| ------------------------------------------ | ----------------------------------------------------------------------------| ------------------------- |
30-
| `tolerations` | Tolerations for pod assignment. Evaluated as a template. | `- operator: "Exists"` |
28+
| Name | Description | Value |
29+
| ------------------------------------------ | ------------------------------------------------------------------------------------------------| ------------------------- |
30+
| `affinity` | Pod scheduling preference. Can be used for instance when some node does not support scaphandre. | `{}` |
31+
| `tolerations` | Tolerations for pod assignment. Evaluated as a template. | `- operator: "Exists"` |
3132

3233
## Install Prometheus
3334

helm/scaphandre/templates/daemonset.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ spec:
5656
runAsUser: {{ .Values.userID }}
5757
runAsGroup: {{ .Values.userGroup }}
5858
serviceAccountName: {{ template "scaphandre.name" . }}
59+
affinity:
60+
{{- with .Values.affinity }}
61+
{{- toYaml . | nindent 8 }}
62+
{{- end }}
5963
{{- with .Values.tolerations }}
6064
tolerations:
6165
{{- toYaml . | nindent 8 }}

helm/scaphandre/templates/servicemonitor.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ spec:
2222
interval: {{ .Values.serviceMonitor.interval }}
2323
{{- end }}
2424
scrapeTimeout: {{ .Values.serviceMonitor.scrapeTimeout }}
25+
{{- if .Values.serviceMonitor.relabelings }}
26+
relabelings:
27+
{{ toYaml .Values.serviceMonitor.relabelings | nindent 8 }}
28+
{{- end }}
2529
namespaceSelector:
2630
matchNames:
2731
- {{ .Release.Namespace }}

helm/scaphandre/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ serviceMonitor:
4141
- __meta_kubernetes_pod_node_name
4242
targetLabel: node
4343

44+
affinity: {}
45+
4446
tolerations:
4547
# Tolerate all taints for observability
4648
- operator: "Exists"

0 commit comments

Comments
 (0)