feat: support topologySpreadConstraints for gateway and api7 chart (#220)

Signed-off-by: Nic <[email protected]>

Author: nic-6443

charts/api7/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.17.28
+version: 0.17.29
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/api7/README.md

@@ -1,6 +1,6 @@
 # api7ee3
 
-![Version: 0.17.28](https://img.shields.io/badge/Version-0.17.28-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.16](https://img.shields.io/badge/AppVersion-3.8.16-informational?style=flat-square)
+![Version: 0.17.29](https://img.shields.io/badge/Version-0.17.29-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.8.16](https://img.shields.io/badge/AppVersion-3.8.16-informational?style=flat-square)
 
 A Helm chart for Kubernetes
 
@@ -236,4 +236,5 @@ A Helm chart for Kubernetes
 | serviceAccount.create | bool | `true` |  |
 | serviceAccount.name | string | `""` |  |
 | tolerations | list | `[]` |  |
+| topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pod assignment https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ The value is evaluated as a template |
 

charts/api7/templates/dashboard-deploy.yaml

@@ -136,3 +136,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- tpl (. | toYaml) $ | nindent 8 }}
+      {{- end }}

charts/api7/templates/developer-portal-deploy.yaml

@@ -110,4 +110,8 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- tpl (. | toYaml) $ | nindent 8 }}
+      {{- end }}
 {{- end }}

charts/api7/templates/dp-manager-deploy.yaml

@@ -121,3 +121,7 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.topologySpreadConstraints }}
+      topologySpreadConstraints:
+        {{- tpl (. | toYaml) $ | nindent 8 }}
+      {{- end }}

charts/api7/values.yaml

@@ -221,6 +221,11 @@ tolerations: []
 
 affinity: {}
 
+# -- Topology Spread Constraints for pod assignment
+# https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
+# The value is evaluated as a template
+topologySpreadConstraints: []
+
 busybox:
   image:
     repository: docker.io/busybox

charts/gateway/Chart.yaml

@@ -14,7 +14,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.32
+version: 0.2.33
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/gateway/README.md

@@ -130,6 +130,7 @@ The command removes all the Kubernetes components associated with the chart and
 | apisix.stream.luaSharedDict.worker-events-stream | string | `"10m"` |  |
 | apisix.timezone | string | `""` | timezone is the timezone where apisix uses. For example: "UTC" or "Asia/Shanghai" This value will be set on apisix container's environment variable TZ. You may need to set the timezone to be consistent with your local time zone, otherwise the apisix's logs may used to retrieve event maybe in wrong timezone. |
 | apisix.tolerations | list | `[]` | List of node taints to tolerate |
+| apisix.topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pod assignment https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/ The value is evaluated as a template |
 | autoscaling.enabled | bool | `false` |  |
 | autoscaling.maxReplicas | int | `100` |  |
 | autoscaling.minReplicas | int | `1` |  |

charts/gateway/templates/_pod.tpl

@@ -254,4 +254,8 @@ spec:
   tolerations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- with .Values.apisix.topologySpreadConstraints }}
+  topologySpreadConstraints:
+    {{- tpl (. | toYaml) $ | nindent 4 }}
+  {{- end }}
 {{- end -}}

charts/gateway/values.yaml

@@ -171,6 +171,11 @@ apisix:
     # -- Set the maxUnavailable of podDisruptionBudget
     maxUnavailable: 1
 
+  # -- Topology Spread Constraints for pod assignment
+  # https://kubernetes.io/docs/concepts/workloads/pods/pod-topology-spread-constraints/
+  # The value is evaluated as a template
+  topologySpreadConstraints: []
+
   # -- Set pod resource requests & limits
   resources: {}
     # -- Use the host's network namespace