Commit 191aac4e authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch 'feature/terminationGracePeriodSeconds' into 'master' 

feat: allow specification of terminationGracePeriodSeconds in deployment

See merge request gitlab-org/cluster-integration/auto-deploy-image!231
parents facc4880 b62e8dc9

assets/auto-deploy-app/Chart.yaml

+1 −1
Original line number Diff line number Diff line 
apiVersion: v1

description: GitLab's Auto-deploy Helm Chart

name: auto-deploy-app

version: 2.16.0

version: 2.18.0

icon: https://gitlab.com/gitlab-com/gitlab-artwork/raw/master/logo/logo-square.png

assets/auto-deploy-app/README.md

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
| podAnnotations                | Pod annotations | `{}`                           |

| nodeSelector                  | Node labels for pod assignment | `{}`           |

| tolerations                   | List of node taints to tolerate | `[]`          |

| terminationGracePeriodSeconds | The amount of time in seconds a pod is given to terminate | [See the Kubernetes API for reference](https://kubernetes.io/docs/reference/kubernetes-api/workload-resources/pod-v1/#lifecycle)          |

| initContainers                | Containers that are run before the app containers are started. | `[]`          |

| affinity                      | Node affinity for pod assignment | `{}`          |

| application.track             |             | `stable`                           |

assets/auto-deploy-app/templates/deployment.yaml

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ spec: 
      initContainers:

{{ toYaml .Values.initContainers | indent 8 }}

{{- end }}

      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}

      containers:

      - name: {{ .Chart.Name }}

        image: {{ template "imagename" . }}