Commit be203b8c authored by Hordur Freyr Yngvason's avatar Hordur Freyr Yngvason
Browse files

Merge branch 'feature/add-support-custom-pod-dns-config' into 'master' 

feat: Add support to override default pod dns config and provide custom config

See merge request gitlab-org/cluster-integration/auto-deploy-image!235
parents a22b1c4c e836f624

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

version: 2.29.0

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

assets/auto-deploy-app/README.md

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
| extraLabels                   | Allow labelling resources with custom key/value pairs | `{}` |

| lifecycle                     | [Container lifecycle hooks](https://kubernetes.io/docs/concepts/containers/container-lifecycle-hooks/) | `{}` |

| podAnnotations                | Pod annotations | `{}`                           |

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

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

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

+7 −0
Original line number Diff line number Diff line
@@ -45,6 +45,13 @@ spec: 
      nodeSelector:

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

{{- end }}

{{- if .Values.dnsPolicy }}

      dnsPolicy: {{ .Values.dnsPolicy }}

{{- end }}

{{- if .Values.dnsConfig }}

      dnsConfig:

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

{{- end }}

{{- if .Values.tolerations }}

      tolerations:

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

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

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

{{- end }}

{{- end }}

{{- with $dnsPolicyConfig := default $.Values.dnsPolicy $workerConfig.dnsPolicy -}}

{{- if $dnsPolicyConfig  }}

        dnsPolicy: {{ $dnsPolicyConfig }}

{{- end }}

{{- end }}

{{- with $dnsConfigConfig := default $.Values.dnsConfig $workerConfig.dnsConfig -}}

{{- if $dnsConfigConfig  }}

        dnsConfig:

{{ toYaml $dnsConfigConfig | indent 10 }}

{{- end }}

{{- end }}

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

{{- if $tolerationsConfig  }}

        tolerations:

assets/auto-deploy-app/values.yaml

+10 −0
Original line number Diff line number Diff line
@@ -18,6 +18,16 @@ lifecycle: {} 
#     command: ["/bin/sh", "-c", "sleep 10"]

podAnnotations: {}

nodeSelector: {}

dnsPolicy: {}

dnsConfig: {}

#    nameservers:

#      - 8.8.8.8

#    searches:

#      - svc.cluster.local

#      - cluster.local

#    options:

#      - name: ndots

#        value: "1"

affinity: {}

tolerations: []

initContainers: []