Add option to specify controller pod toleration for taints

d-nishi · Mar 9, 2018 · 36e0ac9 · 36e0ac9
1 parent 835abd1
commit 36e0ac9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 /main
 /.vscode
 *.tgz
+/.idea
diff --git a/alb-ingress-controller-helm/README.md b/alb-ingress-controller-helm/README.md
@@ -51,6 +51,7 @@ Parameter | Description | Default
 `controller.image.pullPolicy` | controller container image pull policy | `IfNotPresent`
 `controller.extraEnv` | map of environment variables to be injected into the controller pod | `{}`
 `controller.nodeSelector` | node labels for controller pod assignment | `{}`
+`controller.tolerations` | controller pod toleration for taints | `{}`
 `controller.podAnnotations` | annotations to be added to controller pod | `{}`
 `controller.resources` | controller pod resource requests & limits | `{}`
 `controller.service.annotations` | annotations to be added to controller service | `{}`

diff --git a/alb-ingress-controller-helm/templates/controller-deployment.yaml b/alb-ingress-controller-helm/templates/controller-deployment.yaml
@@ -75,6 +75,9 @@ spec:
     {{- if .Values.controller.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.controller.nodeSelector | indent 8 }}
+    {{- end }}
+      tolerations:
+{{ toYaml .Values.controller.tolerations | indent 8 }}
     {{- end }}
       serviceAccountName: {{ if .Values.rbac.create }}{{ template "fullname" . }}{{ else }}"{{ .Values.rbac.serviceAccountName }}"{{ end }}
       terminationGracePeriodSeconds: 60

diff --git a/alb-ingress-controller-helm/values.yaml b/alb-ingress-controller-helm/values.yaml
@@ -31,6 +31,10 @@ controller:
     # node-role.kubernetes.io/node: "true"
     # tier: cs
 
+  tolerations: {}
+#    - key: "node-role.kubernetes.io/master"
+#      effect: NoSchedule
+
   podAnnotations: {}
     # iam.amazonaws.com/role: alb-ingress-controller
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ @@
     /main
     /.vscode
     *.tgz
+    /.idea