Skip to content

Commit 28b1128

Browse files
feat(argo-rollouts): global constraints (nodeSelector/tolerations) (#141)
1 parent f8df864 commit 28b1128

File tree

5 files changed

+16
-13
lines changed

5 files changed

+16
-13
lines changed

charts/argo-rollouts/Chart.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: v1.7.2-cap-CR-28008
33
description: A Helm chart for Argo Rollouts
44
name: argo-rollouts
5-
version: 2.37.3-3-v1.7.2-cap-CR-28008
5+
version: 2.37.3-4-v1.7.2-cap-CR-28008
66
home: https://github.com/argoproj/argo-helm
77
icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
88
keywords:
@@ -19,7 +19,4 @@ annotations:
1919
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2020
artifacthub.io/changes: |
2121
- kind: changed
22-
description: Security fixes for Argo Rollouts v1.7.2
23-
links:
24-
- name: GitHub Release
25-
url: https://github.com/codefresh-io/argo-rollouts/releases/tag/v1.7.2-cap-CR-28008
22+
description: Add default global tolerations and nodeSelector

charts/argo-rollouts/README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ For full list of changes please check ArtifactHub [changelog].
5151
| fullnameOverride | string | `nil` | String to fully override "argo-rollouts.fullname" template |
5252
| global.deploymentAnnotations | object | `{}` | Annotations for all deployed Deployments |
5353
| global.deploymentLabels | object | `{}` | Labels for all deployed Deployments |
54+
| global.nodeSelector | object | `{}` | Default node selector for all components |
5455
| global.revisionHistoryLimit | int | `10` | Number of old deployment ReplicaSets to retain. The rest will be garbage collected. |
56+
| global.tolerations | list | `[]` | Default tolerations for all components |
5557
| imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry. Registry secret names as an array. |
5658
| installCRDs | bool | `true` | Install and upgrade CRDs |
5759
| keepCRDs | bool | `true` | Keep CRD's on helm uninstall |

charts/argo-rollouts/templates/controller/deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ spec:
9595
initContainers:
9696
{{- toYaml . | nindent 8 }}
9797
{{- end }}
98-
{{- if .Values.controller.nodeSelector }}
98+
{{- with .Values.controller.nodeSelector | default .Values.global.nodeSelector }}
9999
nodeSelector:
100-
{{- toYaml .Values.controller.nodeSelector | nindent 8 }}
100+
{{- toYaml . | nindent 8 }}
101101
{{- end }}
102102
securityContext:
103103
{{- toYaml .Values.podSecurityContext | nindent 8 }}
104-
{{- if .Values.controller.tolerations }}
104+
{{- with .Values.controller.tolerations | default .Values.global.tolerations }}
105105
tolerations:
106-
{{- toYaml .Values.controller.tolerations | nindent 8 }}
106+
{{- toYaml . | nindent 8 }}
107107
{{- end }}
108108
{{- if .Values.controller.affinity }}
109109
affinity:

charts/argo-rollouts/templates/dashboard/deployment.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,15 @@ spec:
7171
volumeMounts:
7272
{{- toYaml . | nindent 8 }}
7373
{{- end }}
74-
{{- if .Values.dashboard.nodeSelector }}
74+
{{- with .Values.dashboard.nodeSelector | default .Values.global.nodeSelector }}
7575
nodeSelector:
76-
{{- toYaml .Values.dashboard.nodeSelector | nindent 8 }}
76+
{{- toYaml . | nindent 8 }}
7777
{{- end }}
7878
securityContext:
7979
{{- toYaml .Values.dashboard.podSecurityContext | nindent 8 }}
80-
{{- if .Values.dashboard.tolerations }}
80+
{{- with .Values.dashboard.tolerations | default .Values.global.tolerations }}
8181
tolerations:
82-
{{- toYaml .Values.dashboard.tolerations | nindent 8 }}
82+
{{- toYaml . | nindent 8 }}
8383
{{- end }}
8484
{{- if .Values.dashboard.affinity }}
8585
affinity:

charts/argo-rollouts/values.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,10 @@ global:
4545
deploymentLabels: {}
4646
# -- Number of old deployment ReplicaSets to retain. The rest will be garbage collected.
4747
revisionHistoryLimit: 10
48+
# -- Default node selector for all components
49+
nodeSelector: {}
50+
# -- Default tolerations for all components
51+
tolerations: []
4852

4953
controller:
5054
# -- Value of label `app.kubernetes.io/component`

0 commit comments

Comments
 (0)