Skip to content

Agent Mesh

charts: pass nodeSelector, tolerations and affinity through to every workload

Tomas Tormob079565d5c4e
diff --git a/charts/sam-mesh/templates/console-deployment.yaml b/charts/sam-mesh/templates/console-deployment.yaml
index a16ef4e9..1490c4f3 100644
--- a/charts/sam-mesh/templates/console-deployment.yaml
+++ b/charts/sam-mesh/templates/console-deployment.yaml
@@ -18,6 +18,18 @@ spec:
labels:
app: {{ include "sam-mesh.fullname" . }}-console
spec:
+ {{- with .Values.console.nodeSelector }}
+ nodeSelector:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.console.tolerations }}
+ tolerations:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.console.affinity }}
+ affinity:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
{{- with .Values.console.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
diff --git a/charts/sam-mesh/templates/control-plane-deployment.yaml b/charts/sam-mesh/templates/control-plane-deployment.yaml
index 622c80e7..2f371037 100644
--- a/charts/sam-mesh/templates/control-plane-deployment.yaml
+++ b/charts/sam-mesh/templates/control-plane-deployment.yaml
@@ -17,6 +17,18 @@ spec:
labels:
app: {{ include "sam-mesh.fullname" . }}-control-plane
spec:
+ {{- with .Values.controlPlane.nodeSelector }}
+ nodeSelector:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.controlPlane.tolerations }}
+ tolerations:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.controlPlane.affinity }}
+ affinity:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
{{- with .Values.controlPlane.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
diff --git a/charts/sam-mesh/templates/db-statefulset.yaml b/charts/sam-mesh/templates/db-statefulset.yaml
index 5a75e891..2e635355 100644
--- a/charts/sam-mesh/templates/db-statefulset.yaml
+++ b/charts/sam-mesh/templates/db-statefulset.yaml
@@ -16,6 +16,18 @@ spec:
labels:
app: {{ include "sam-mesh.fullname" . }}-db
spec:
+ {{- with .Values.database.postgres.nodeSelector }}
+ nodeSelector:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.database.postgres.tolerations }}
+ tolerations:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.database.postgres.affinity }}
+ affinity:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
containers:
- name: postgres
image: "{{ .Values.database.postgres.image.repository }}:{{ .Values.database.postgres.image.tag }}"
diff --git a/charts/sam-mesh/templates/router-statefulset.yaml b/charts/sam-mesh/templates/router-statefulset.yaml
index 26b7d2f8..9b1561fe 100644
--- a/charts/sam-mesh/templates/router-statefulset.yaml
+++ b/charts/sam-mesh/templates/router-statefulset.yaml
@@ -28,6 +28,14 @@ spec:
nodeSelector:
{{- toYaml . | nindent 8 }}
{{- end }}
+ {{- with .Values.router.tolerations }}
+ tolerations:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
+ {{- with .Values.router.affinity }}
+ affinity:
+ {{- toYaml . | nindent 8 }}
+ {{- end }}
{{- with .Values.router.podSecurityContext }}
securityContext:
{{- toYaml . | nindent 8 }}
diff --git a/charts/sam-mesh/values.yaml b/charts/sam-mesh/values.yaml
index b674969a..1a82c2d3 100644
--- a/charts/sam-mesh/values.yaml
+++ b/charts/sam-mesh/values.yaml
@@ -47,6 +47,9 @@ controlPlane:
# (comma-separated for more than one); the control plane refuses to start without one.
oidcIssuer: ""
allowedAudiences: "sam-mesh-audience,sam-control-plane-audience"
+ nodeSelector: {}
+ tolerations: []
+ affinity: {}
podSecurityContext:
runAsNonRoot: true
# Dockerfiles say "USER nonroot" by name; runAsNonRoot needs the numeric uid.
@@ -85,6 +88,9 @@ database:
port: 5432
sslmode: disable
storageSize: 1Gi
+ nodeSelector: {}
+ tolerations: []
+ affinity: {}
resources:
requests:
cpu: 100m
@@ -119,6 +125,8 @@ router:
# transports. One router per node.
hostPort: null
nodeSelector: {}
+ tolerations: []
+ affinity: {}
# Overrides the announced multiaddrs; derived from hostPort when left empty.
externalAddrs: []
allowLoopback: false
@@ -142,6 +150,9 @@ console:
repository: sam-console
# Overrides global.imageTag for this image only.
tag: ""
+ nodeSelector: {}
+ tolerations: []
+ affinity: {}
podSecurityContext:
runAsNonRoot: true
# Dockerfiles say "USER nonroot" by name; runAsNonRoot needs the numeric uid.