Add support to custom affinity

hubblo-org · Nov 13, 2023 · 6595ebf · 6595ebf
1 parent ccc0205
commit 6595ebf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/docs_src/tutorials/kubernetes.md b/docs_src/tutorials/kubernetes.md
@@ -25,9 +25,10 @@ to be installed from the source code.
 | `serviceMonitor.relabelings`   | Allow to add extra labels to metrics                                                          | Add node metrics         |
 
 #### Other parameters
-| Name                                       | Description                                                                 | Value                     |
-| ------------------------------------------ | ----------------------------------------------------------------------------| ------------------------- |
-| `tolerations`                              | Tolerations for pod assignment. Evaluated as a template.                    | `- operator: "Exists"`    |
+| Name                                       | Description                                                                                     | Value                     |
+| ------------------------------------------ | ------------------------------------------------------------------------------------------------| ------------------------- |
+| `affinity`                                 | Pod scheduling preference. Can be used for instance when some node does not support scaphandre. | `{}`                      |
+| `tolerations`                              | Tolerations for pod assignment. Evaluated as a template.                                        | `- operator: "Exists"`    |
 
 ## Install Prometheus
 

diff --git a/helm/scaphandre/templates/daemonset.yaml b/helm/scaphandre/templates/daemonset.yaml
@@ -56,6 +56,10 @@ spec:
         runAsUser: {{ .Values.userID }}
         runAsGroup: {{ .Values.userGroup }}
       serviceAccountName: {{ template "scaphandre.name" . }}
+      affinity:
+        {{- with .Values.affinity }}
+        {{- toYaml . | nindent 8 }}
+        {{- end }}
     {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

diff --git a/helm/scaphandre/templates/servicemonitor.yaml b/helm/scaphandre/templates/servicemonitor.yaml
@@ -22,6 +22,10 @@ spec:
       interval: {{ .Values.serviceMonitor.interval }}
       {{- end }}
       scrapeTimeout:  {{ .Values.serviceMonitor.scrapeTimeout }}
+      {{- if .Values.serviceMonitor.relabelings }}
+      relabelings:
+          {{ toYaml .Values.serviceMonitor.relabelings | nindent 8 }}
+      {{- end }}
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}

diff --git a/helm/scaphandre/values.yaml b/helm/scaphandre/values.yaml
@@ -41,6 +41,8 @@ serviceMonitor:
       - __meta_kubernetes_pod_node_name
     targetLabel: node
 
+affinity: {}
+
 tolerations:
   # Tolerate all taints for observability
   - operator: "Exists"