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.

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

feat: add possibility to configure tolerations #464

Merged
merged 4 commits into from
Sep 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions helm/flowforge/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ For other values please refer to the documentation below.
- `forge.labels` allows to add custom labels to the core application related objects (e.g. deployment, services, etc.) (default `{}`)
- `forge.podLabels` allows to add custom labels to the core application pod (default `{}`)
- `forge.replicas` allows the number of instances of the FlowFuse App to be set. Scaling only supported with ingress-nginx controller (default `1`)
- `forge.tolerations` allows to configure [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for the core application deployment (default `[]`)


note: `forge.projectSelector` and `forge.managementSelector` defaults mean that you must have at least 2 nodes in your cluster and they need to be labeled before installing.
Expand Down Expand Up @@ -100,6 +101,7 @@ To use STMP to send email
- `forge.broker.startupProbe` block with [startupProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) configuration for the broker pod (check [here](#liveness-readiness-and-startup-probes) for more details)
- `forge.broker.labels` allows to add custom labels to the broker related objects (e.g. deployment, services, etc.) (default `{}`)
- `forge.broker.podLabels` allows to add custom labels to the broker pod (default `{}`)
- `forge.broker.tolerations` allows to configure [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for the broker deployment (default `[]`)
- `forge.broker.ingress.annotations` broker ingress annotations (default is `{}`)

`forge.broker.ingress.annotations` values can contain the following tokens that will be replaced as follows:
Expand Down Expand Up @@ -167,6 +169,7 @@ Enables FlowForge Telemetry
- `forge.fileStore.startupProbe` block with [startupProbe](https://kubernetes.io/docs/tasks/configure-pod-container/configure-liveness-readiness-startup-probes/) configuration for the flowforge-file pod (check [here](#liveness-readiness-and-startup-probes) for more details)
- `forge.fileStore.labels` allows to add custom labels to the file-server related objects (e.g. deployment, services, etc.) (default `{}`)
- `forge.fileStore.podLabels` allows to add custom labels to the file-server pod (default `{}`)
- `forge.fileStore.tolerations` allows to configure [tolerations](https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/) for the file-server deployment (default `[]`)
- `forge.fileStore.telemetry.backend.prometheus.enabled` enables the `/metrics` endpoint on the fileStore app for scraping by Prometheus

### Persistent Storage
Expand Down
4 changes: 4 additions & 0 deletions helm/flowforge/templates/broker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ spec:
{{- if .Values.forge.broker.resources }}
resources: {{- toYaml .Values.forge.broker.resources | nindent 12 }}
{{- end }}
{{- if .Values.forge.broker.tolerations}}
tolerations:
{{ toYaml .Values.forge.broker.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.forge.registrySecrets }}
imagePullSecrets:
{{- range .Values.forge.registrySecrets }}
Expand Down
4 changes: 4 additions & 0 deletions helm/flowforge/templates/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,10 @@ spec:
resources: {{- toYaml .Values.forge.resources | nindent 12 }}
{{- end }}
securityContext: {{- toYaml .Values.forge.containerSecurityContext | nindent 10 }}
{{- if .Values.forge.tolerations}}
tolerations:
{{ toYaml .Values.forge.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.forge.registrySecrets }}
imagePullSecrets:
{{- range .Values.forge.registrySecrets }}
Expand Down
4 changes: 4 additions & 0 deletions helm/flowforge/templates/file-storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,10 @@ spec:
{{- if .Values.forge.fileStore.resources }}
resources: {{- toYaml .Values.forge.fileStore.resources | nindent 12 }}
{{- end }}
{{- if .Values.forge.fileStore.tolerations}}
tolerations:
{{ toYaml .Values.forge.fileStore.tolerations | nindent 8 }}
{{- end }}
{{- if .Values.forge.registrySecrets }}
imagePullSecrets:
{{- range .Values.forge.registrySecrets }}
Expand Down
9 changes: 9 additions & 0 deletions helm/flowforge/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,9 @@
"labels": {
"type": "object"
},
"tolerations": {
"type": "array"
},
"ingress": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -586,6 +589,9 @@
"labels": {
"type": "object"
},
"tolerations": {
"type": "array"
},
"image": {
"type": "string"
},
Expand Down Expand Up @@ -816,6 +822,9 @@
"labels": {
"type": "object"
},
"tolerations": {
"type": "array"
},
"logPassthrough": {
"type": "boolean"
},
Expand Down
4 changes: 4 additions & 0 deletions helm/flowforge/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ forge:
readOnlyRootFilesystem: true
labels: {}
podLabels: {}
tolerations: []
ingress.annotations: {}

persistentStorage:
Expand Down Expand Up @@ -70,6 +71,7 @@ forge:
readOnlyRootFilesystem: true
labels: {}
podLabels: {}
tolerations: []
telemetry:
backend:
prometheus:
Expand Down Expand Up @@ -121,6 +123,8 @@ forge:
successThreshold: 1
failureThreshold: 3

tolerations: []

logPassthrough: false
customHostname:
enabled: false
Expand Down
Loading