feat: Allow configuring tolerations for the EG control plane installe…

…d via Helm (#3587) * feat: Allow configuring tolerations for the EG control plane Signed-off-by: Connor Rogers <[email protected]> * Fix indentation on topologySpreadConstraints and tolerations Signed-off-by: Connor Rogers <[email protected]> * Fix topologySpreadConstraints and tolerations type, and add tests Signed-off-by: Connor Rogers <[email protected]> * Fix indentation in input test values file Signed-off-by: Connor Rogers <[email protected]> --------- Signed-off-by: Connor Rogers <[email protected]>
envoyproxy · Jun 12, 2024 · 0abdda7 · 0abdda7
1 parent ab3a3d2
commit 0abdda7
Show file tree

Hide file tree

Showing 7 changed files with 623 additions and 5 deletions.
diff --git a/charts/gateway-helm/README.md b/charts/gateway-helm/README.md
@@ -80,7 +80,8 @@ To uninstall the chart:
 | deployment.pod.annotations."prometheus.io/port" | string | `"19001"` |  |
 | deployment.pod.annotations."prometheus.io/scrape" | string | `"true"` |  |
 | deployment.pod.labels | object | `{}` |  |
-| deployment.pod.topologySpreadConstraints | object | `{}` |  |
+| deployment.pod.tolerations | list | `[]` |  |
+| deployment.pod.topologySpreadConstraints | list | `[]` |  |
 | deployment.ports[0].name | string | `"grpc"` |  |
 | deployment.ports[0].port | int | `18000` |  |
 | deployment.ports[0].targetPort | int | `18000` |  |

diff --git a/charts/gateway-helm/templates/envoy-gateway-deployment.yaml b/charts/gateway-helm/templates/envoy-gateway-deployment.yaml
@@ -39,7 +39,11 @@ spec:
       {{- end }}
       {{- with .Values.deployment.pod.topologySpreadConstraints }}
       topologySpreadConstraints:
-        {{- toYaml . | nindent 8 }}
+        {{- toYaml . | nindent 6 }}
+      {{- end }}
+      {{- with .Values.deployment.pod.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 6 }}
       {{- end }}
       containers:
       - args:

diff --git a/charts/gateway-helm/values.tmpl.yaml b/charts/gateway-helm/values.tmpl.yaml
@@ -50,7 +50,8 @@ deployment:
       prometheus.io/scrape: 'true'
       prometheus.io/port: '19001'
     labels: {}
-    topologySpreadConstraints: {}
+    topologySpreadConstraints: []
+    tolerations: []
 
 config:
   envoyGateway:

diff --git a/site/content/en/latest/install/gateway-helm-api.md b/site/content/en/latest/install/gateway-helm-api.md
@@ -44,7 +44,8 @@ The Helm chart for Envoy Gateway
 | deployment.pod.annotations."prometheus.io/port" | string | `"19001"` |  |
 | deployment.pod.annotations."prometheus.io/scrape" | string | `"true"` |  |
 | deployment.pod.labels | object | `{}` |  |
-| deployment.pod.topologySpreadConstraints | object | `{}` |  |
+| deployment.pod.tolerations | list | `[]` |  |
+| deployment.pod.topologySpreadConstraints | list | `[]` |  |
 | deployment.ports[0].name | string | `"grpc"` |  |
 | deployment.ports[0].port | int | `18000` |  |
 | deployment.ports[0].targetPort | int | `18000` |  |

diff --git a/site/content/zh/latest/install/gateway-helm-api.md b/site/content/zh/latest/install/gateway-helm-api.md
@@ -44,7 +44,8 @@ The Helm chart for Envoy Gateway
 | deployment.pod.annotations."prometheus.io/port" | string | `"19001"` |  |
 | deployment.pod.annotations."prometheus.io/scrape" | string | `"true"` |  |
 | deployment.pod.labels | object | `{}` |  |
-| deployment.pod.topologySpreadConstraints | object | `{}` |  |
+| deployment.pod.tolerations | list | `[]` |  |
+| deployment.pod.topologySpreadConstraints | list | `[]` |  |
 | deployment.ports[0].name | string | `"grpc"` |  |
 | deployment.ports[0].port | int | `18000` |  |
 | deployment.ports[0].targetPort | int | `18000` |  |

diff --git a/test/helm/deployment-custom-topology.in.yaml b/test/helm/deployment-custom-topology.in.yaml
@@ -0,0 +1,35 @@
+global:
+  images:
+    envoyGateway:
+      image: "docker.io/envoyproxy/gateway-dev:latest"
+      pullPolicy: Always
+deployment:
+  pod:
+    affinity:
+      nodeAffinity:
+        requiredDuringSchedulingIgnoredDuringExecution:
+          nodeSelectorTerms:
+          - matchExpressions:
+            - key: topology.kubernetes.io/zone
+              operator: In
+              values:
+              - antarctica-east1
+              - antarctica-west1
+    topologySpreadConstraints:
+    - topologyKey: kubernetes.io/hostname
+      maxSkew: 1
+      whenUnsatisfiable: DoNotSchedule
+      labelSelector:
+        matchLabels:
+          app: envoyproxy
+          control-plane: envoy-control-plane
+    - topologyKey: topology.kubernetes.io/zone
+      maxSkew: 1
+      whenUnsatisfiable: ScheduleAnyway
+      labelSelector:
+        matchLabels:
+          app: envoyproxy
+    tolerations:
+    - key: "custom.taint"
+      operator: "Equal"
+      value: "custom.value"