Merge pull request #138 from antonu17/patch/aes-redis

Add affinity and tolerations parameters to aes-redis deployment template
datawire · Oct 23, 2020 · 648d1af · 648d1af
2 parents 7a6af3d + 1ea7ccb
commit 648d1af
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ numbering uses [semantic versioning](http://semver.org).
 
 ## Next Release
 
+## v6.5.11
+
+- Feature: add affinity and tolerations support for redis pods
+
 ## v6.5.10
 
 - Update Ambassador to version 1.8.1: [CHANGELOG](https://github.com/datawire/ambassador/blob/master/CHANGELOG.md)

diff --git a/Chart.yaml b/Chart.yaml
@@ -3,7 +3,7 @@ appVersion: 1.8.1
 ossVersion: 1.8.1
 description: A Helm chart for Datawire Ambassador
 name: ambassador
-version: 6.5.10
+version: 6.5.11
 icon: https://www.getambassador.io/images/logo.png
 home: https://www.getambassador.io/
 sources:

diff --git a/README.md b/README.md
@@ -152,6 +152,8 @@ The following tables lists the configurable parameters of the Ambassador chart a
 | `redis.annotations`                                | Annotations for the redis service and deployment                                                                                                                         | `""`                                                                                                |
 | `redis.resources`                                  | Resource requests for the redis instance                                                                                                                                 | `""`                                                                                                |
 | `redis.nodeSelector`                               | NodeSelector for redis pods                                                                                                                                              | `{}`                                                                                                |
+| `redis.affinity`                                   | Affinity for redis pods                                                                                                                                                  | `{}`                                                                                                |
+| `redis.tolerations`                                | Tolerations for redis pods                                                                                                                                               | `{}`                                                                                                |
 | `authService.create`                               | Create the `AuthService` CRD for Ambassador Edge Stack                                                                                                                   | `true`                                                                                              |
 | `authService.optional_configurations`              | Config options for the `AuthService` CRD                                                                                                                                 | `""`                                                                                                |
 | `rateLimit.create`                                 | Create the `RateLimit` CRD for Ambassador Edge Stack                                                                                                                     | `true`                                                                                              |

diff --git a/templates/aes-redis.yaml b/templates/aes-redis.yaml
@@ -67,4 +67,12 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.redis.affinity }}
+      affinity:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- with .Values.redis.tolerations }}
+      tolerations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
 {{ end }}
diff --git a/values.yaml b/values.yaml
@@ -362,6 +362,8 @@ redis:
   #     cpu: 50m
   #     memory: 128Mi
   nodeSelector: {}
+  affinity: {}
+  tolerations: {}
 
 
 # Configures the AuthService that ships with the Ambassador Edge Stack.