Commit 2c2b4278 authored by Shinya Maeda's avatar Shinya Maeda
Browse files

Merge branch 'fix-topology-spread-constraints' into 'master' 

fix: remove version check on topologySpreadConstraints

Closes #228

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



Merged-by: default avatarShinya Maeda <shinya@gitlab.com>
Approved-by: default avatarJoão Alexandre Cunha <j.a.cunha@gmail.com>
Approved-by: default avatarShinya Maeda <shinya@gitlab.com>
Co-authored-by: default avatarHordur Freyr Yngvason <hfyngvason@gitlab.com>
parents 3181840e 455fcb79

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

version: 2.38.1

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

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

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ spec: 
      initContainers:

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

{{- end }}

{{- if and (semverCompare ">= 1.19.x" .Capabilities.KubeVersion.Version) (.Values.topologySpreadConstraints) }}

{{- if .Values.topologySpreadConstraints }}

      topologySpreadConstraints:

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

{{- end }}