Made terminationGracePeriodSeconds configurable (#21385)

Signed-off-by: Michal Koziorowski <Michal.Koziorowski@tomtom.com>

Co-authored-by: Michal Koziorowski <Michal.Koziorowski@tomtom.com>
This commit is contained in:
Michal Koziorowski
2020-03-12 04:20:37 -07:00
committed by GitHub
co-authored by Michal Koziorowski
parent 5f56365f0a
commit 3fc1bb3ce9
5 changed files with 7 additions and 3 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: haproxy-ingress
version: 0.0.22
version: 0.0.23
appVersion: 0.7.2
home: https://github.com/jcmoraisjr/haproxy-ingress
description: Ingress controller implementation for haproxy loadbalancer.
+1
View File
@@ -73,6 +73,7 @@ Parameter | Description | Default
`controller.config` | additional haproxy-ingress [ConfigMap entries](https://github.com/jcmoraisjr/haproxy-ingress/blob/v0.6/README.md#configmap) | `{}`
`controller.hostNetwork` | Optionally set to true when using CNI based kubernetes installations | `false`
`controller.dnsPolicy` | Optionally change this to ClusterFirstWithHostNet in case you have 'hostNetwork: true' | `ClusterFirst`
`controller.terminationGracePeriodSeconds` | How much to wait before terminating a pod (in seconds) | `60`
`controller.kind` | Type of deployment, DaemonSet or Deployment | `Deployment`
`controller.tcp` | TCP [service ConfigMap](https://github.com/jcmoraisjr/haproxy-ingress/blob/v0.6/README.md#tcp-services-configmap): `<port>: <namespace>/<servicename>:<portnumber>[:[<in-proxy>][:<out-proxy>]]` | `{}`
`controller.enableStaticPorts` | Set to `false` to only rely on ports from `controller.tcp` | `true`
@@ -177,7 +177,7 @@ spec:
configMap:
name: {{ template "haproxy-ingress.controller.fullname" . }}-template
{{- end }}
terminationGracePeriodSeconds: 60
terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
dnsPolicy: {{ .Values.controller.dnsPolicy }}
hostNetwork: {{ .Values.controller.hostNetwork }}
{{- if .Values.controller.nodeSelector }}
@@ -171,7 +171,7 @@ spec:
configMap:
name: {{ template "haproxy-ingress.controller.fullname" . }}-template
{{- end }}
terminationGracePeriodSeconds: 60
terminationGracePeriodSeconds: {{ .Values.controller.terminationGracePeriodSeconds }}
dnsPolicy: {{ .Values.controller.dnsPolicy }}
hostNetwork: {{ .Values.controller.hostNetwork }}
{{- if .Values.controller.nodeSelector }}
+3
View File
@@ -111,6 +111,9 @@ controller:
# to keep resolving names inside the k8s network, use ClusterFirstWithHostNet.
dnsPolicy: ClusterFirst
# How many seconds to wait before terminating a pod.
terminationGracePeriodSeconds: 60
## DaemonSet or Deployment
##
kind: Deployment