Commit 1b7b813d authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

Merge branch 'master' into 'master' 

feat: add securityContext configuration option

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



Merged-by: default avatarHordur Freyr Yngvason <hfyngvason@gitlab.com>
Approved-by: default avatarHordur Freyr Yngvason <hfyngvason@gitlab.com>
Reviewed-by: default avatarHordur Freyr Yngvason <hfyngvason@gitlab.com>
Co-authored-by: default avatarMárkó Ábrahám <abmarko1@gmail.com>
Co-authored-by: default avatarMarko Abraham <Marko.Abraham@entaingroup.com>
parents ca4452d0 a2a9c34d

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

version: 2.67.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
@@ -25,6 +25,7 @@ 
| dnsPolicy                     | Pod DNS policy  | `{}`                           |

| 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 | `{}`           |

| 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
@@ -56,6 +56,12 @@ items: 
            {{ toYaml $nodeSelectorConfig | nindent 14 }}

            {{- end }}

            {{- end }}

            {{- with $securityContextConfig := default $.Values.securityContext $jobConfig.securityContext -}}

            {{- if $securityContextConfig }}

            securityContext:

            {{ toYaml $securityContextConfig | nindent 14 }}

            {{- end }}

            {{- end }}

            {{- with $tolerationsConfig := default $.Values.tolerations $jobConfig.tolerations -}}

            {{- if $tolerationsConfig }}

            tolerations:

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

+4 −0
Original line number Diff line number Diff line
@@ -45,6 +45,10 @@ spec: 
      nodeSelector:

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

{{- end }}

{{- if .Values.securityContext }}

      securityContext:

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

{{- end }}

{{- if .Values.hostNetwork }}

      hostNetwork: {{ .Values.hostNetwork }}

{{- end }}

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

+6 −0
Original line number Diff line number Diff line
@@ -59,6 +59,12 @@ items: 
{{ toYaml $nodeSelectorConfig | indent 10 }}

{{- end }}

{{- end }}

{{- with $securityContextConfig := default $.Values.securityContext $workerConfig.securityContext -}}

{{- if $securityContextConfig }}

        securityContext:

{{ toYaml $securityContextConfig | indent 10 }}

{{- end }}

{{- end }}

{{- with $hostNetworkConfig := default $.Values.hostNetwork $workerConfig.hostNetwork -}}

{{- if $hostNetworkConfig  }}

        hostNetwork: {{ $hostNetworkConfig }}