Commit 3438c11f authored by João Alexandre Cunha's avatar João Alexandre Cunha
Browse files

Merge branch 'add-containerSecurityContext' into 'master' 

feat: add containerSecurityContext configuration option

See merge request https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/362



Merged-by: default avatarJoão Alexandre Cunha <j.a.cunha@gmail.com>
Approved-by: default avatarTaka Nishida <tnishida@gitlab.com>
Approved-by: default avatarJoão Alexandre Cunha <j.a.cunha@gmail.com>
Reviewed-by: default avatarTaka Nishida <tnishida@gitlab.com>
Co-authored-by: default avatarAlexander Rusa <alex@rusa.at>
parents 2cbd172e a04787cb

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.67.0

version: 2.68.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
@@ -26,6 +26,7 @@ 
| dnsConfig                     | [Pod DNS config](https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config)  | `{}` |

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

| securityContext               | SecurityContext definition for deployment | `{}`           |

| containerSecurityContext      | SecurityContext definition for containers | `{}`           |

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

| priorityClassName             | Assign node [priority](https://kubernetes.io/docs/concepts/scheduling-eviction/pod-priority-preemption/) from priorityClass | `""`

| 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)          |

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

+6 −0
Original line number Diff line number Diff line
@@ -180,6 +180,12 @@ items: 
                periodSeconds: {{ $readinessProbe.periodSeconds }}

              {{- end }}

              {{- end }}

              {{- with $containerSecurityContextConfig := default $.Values.containerSecurityContext $jobConfig.containerSecurityContext -}}

              {{- if $containerSecurityContextConfig }}

              securityContext:

              {{ toYaml $containerSecurityContextConfig | nindent 16 }}

              {{- end }}

              {{- end }}

              resources:

                {{ toYaml $.Values.resources | nindent 16 }}

              {{- if $jobConfig.extraVolumeMounts }}

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

+4 −0
Original line number Diff line number Diff line
@@ -244,6 +244,10 @@ spec: 
          timeoutSeconds: {{ .Values.startupProbe.timeoutSeconds }}

          failureThreshold: {{ .Values.startupProbe.failureThreshold }}

          periodSeconds: {{ .Values.startupProbe.periodSeconds }}

{{- end }}

{{- if .Values.containerSecurityContext }}

        securityContext:

{{ toYaml .Values.containerSecurityContext | indent 10 }}

{{- end }}

        resources:

{{ toYaml .Values.resources | indent 12 }}

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

+6 −0
Original line number Diff line number Diff line
@@ -204,6 +204,12 @@ items: 
{{ toYaml $workerConfig.preStopCommand | indent 16 }}

            {{- end}}

          {{- end }}

{{- with $containerSecurityContextConfig := default $.Values.containerSecurityContext $workerConfig.containerSecurityContext -}}

{{- if $containerSecurityContextConfig }}

          securityContext:

{{ toYaml $containerSecurityContextConfig | indent 12 }}

{{- end }}

{{- end }}

          resources:

{{ $workerConfig.resources | default $.Values.resources | toYaml | indent 12 }}

{{- if $workerConfig.extraVolumeMounts }}