Skip to content

Commit 4b11ca2

Browse files
ilia-medvedev-codefreshilia-medvedev-codefresh
committed
merge 5.28.1
2 parents 09e6ec4 + b19beee commit 4b11ca2

File tree

29 files changed

+162
-34
lines changed

29 files changed

+162
-34
lines changed

‎.github/workflows/lint-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Setup Chart Linting
2828
id: lint
29-
uses: helm/chart-testing-action@v2.3.1
29+
uses: helm/chart-testing-action@v2.4.0
3030
with:
3131
# Note: Also update in scripts/lint.sh
3232
version: v3.7.1

‎.github/workflows/stale.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
pull-requests: write # for actions/stale to close stale PRs
1515
runs-on: ubuntu-latest
1616
steps:
17-
- uses: actions/stale@v7
17+
- uses: actions/stale@v8
1818
with:
1919
repo-token: ${{ secrets.GITHUB_TOKEN }}
2020
# Number of days of inactivity before an issue becomes stale

‎charts/argo-cd/Chart.lock‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
dependencies:
22
- name: redis-ha
33
repository: https://dandydeveloper.github.io/charts/
4-
version: 4.22.4
5-
digest: sha256:5df60910862b364ebfb82cba2b2f0951c39ad36446647fb3f501bdeadc92fbd7
6-
generated: "2022-12-26T22:58:11.561184+09:00"
4+
version: 4.22.5
5+
digest: sha256:d2e927511e515fb862f23dd413ee3a356c855d808f6f9ad1d345ee62b8c7ea16
6+
generated: "2023-03-30T08:25:32.738257836+02:00"

‎charts/argo-cd/Chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
appVersion: v2.6.0-cap-CR-17237
33
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
44
name: argo-cd
5-
version: 5.27.1-2-cap-CR-17237
5+
version: 5.28.1-1-cap-CR-17237
66
kubeVersion: ">=1.22.0-0"
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
@@ -18,10 +18,10 @@ maintainers:
1818
url: https://argoproj.github.io/
1919
dependencies:
2020
- name: redis-ha
21-
version: 4.22.4
21+
version: 4.22.5
2222
repository: https://dandydeveloper.github.io/charts/
2323
condition: redis-ha.enabled
2424
annotations:
2525
artifacthub.io/changes: |
26-
- kind: changed
27-
description: Upgrade Argo CD to v2.6.6
26+
- kind: fixed
27+
description: Change default value for global.tolerations, from object to array.

‎charts/argo-cd/README.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,9 @@ NAME: my-release
394394
| global.affinity.nodeAffinity.type | string | `"hard"` | Default node affinity rules. Either: `none`, `soft` or `hard` |
395395
| global.affinity.podAntiAffinity | string | `"soft"` | Default pod anti-affinity rules. Either: `none`, `soft` or `hard` |
396396
| global.deploymentAnnotations | object | `{}` | Annotations for the all deployed Deployments |
397+
| global.deploymentStrategy | object | `{}` | Deployment strategy for the all deployed Deployments |
398+
| global.entrypoint.entrypoint | string | `"entrypoint.sh"` | The entrypoint to use for the containers. |
399+
| global.entrypoint.useImplicit | bool | `false` | Implicitly use the docker image's entrypoint. This requires the image to have ENTRYPOINT set properly |
397400
| global.hostAliases | list | `[]` | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files |
398401
| global.image.imagePullPolicy | string | `"IfNotPresent"` | If defined, a imagePullPolicy applied to all Argo CD deployments |
399402
| global.image.repository | string | `"quay.io/codefresh/argocd"` | If defined, a repository applied to all Argo CD deployments |
@@ -410,7 +413,7 @@ NAME: my-release
410413
| global.revisionHistoryLimit | int | `3` | Number of old deployment ReplicaSets to retain. The rest will be garbage collected. |
411414
| global.securityContext | object | `{}` (See [values.yaml]) | Toggle and define pod-level security context. |
412415
| global.statefulsetAnnotations | object | `{}` | Annotations for the all deployed Statefulsets |
413-
| global.tolerations | object | `{}` | Default tolerations for all components |
416+
| global.tolerations | list | `[]` | Default tolerations for all components |
414417
| global.topologySpreadConstraints | list | `[]` | Default [TopologySpreadConstraints] rules for all components |
415418

416419
## Argo CD Configs
@@ -571,6 +574,7 @@ NAME: my-release
571574
| repoServer.containerPorts.server | int | `8081` | Repo server container port |
572575
| repoServer.containerSecurityContext | object | See [values.yaml] | Repo server container-level security context |
573576
| repoServer.deploymentAnnotations | object | `{}` | Annotations to be added to repo server Deployment |
577+
| repoServer.deploymentStrategy | object | `{}` | Deployment strategy to be added to the repo server Deployment |
574578
| repoServer.dnsConfig | object | `{}` | [DNS configuration] |
575579
| repoServer.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for Repo server pods |
576580
| repoServer.env | list | `[]` | Environment variables to pass to repo server |
@@ -674,6 +678,7 @@ NAME: my-release
674678
| server.containerPorts.server | int | `8080` | Server container port |
675679
| server.containerSecurityContext | object | See [values.yaml] | Server container-level security context |
676680
| server.deploymentAnnotations | object | `{}` | Annotations to be added to server Deployment |
681+
| server.deploymentStrategy | object | `{}` | Deployment strategy to be added to the server Deployment |
677682
| server.dnsConfig | object | `{}` | [DNS configuration] |
678683
| server.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for Server pods |
679684
| server.env | list | `[]` | Environment variables to pass to Argo CD server |
@@ -820,6 +825,7 @@ server:
820825
| dex.containerPorts.metrics | int | `5558` | Metrics container port |
821826
| dex.containerSecurityContext | object | See [values.yaml] | Dex container-level security context |
822827
| dex.deploymentAnnotations | object | `{}` | Annotations to be added to the Dex server Deployment |
828+
| dex.deploymentStrategy | object | `{}` | Deployment strategy to be added to the Dex server Deployment |
823829
| dex.dnsConfig | object | `{}` | [DNS configuration] |
824830
| dex.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for Dex server pods |
825831
| dex.enabled | bool | `true` | Enable dex |
@@ -1010,6 +1016,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
10101016
| applicationSet.containerPorts.webhook | int | `7000` | Webhook container port |
10111017
| applicationSet.containerSecurityContext | object | See [values.yaml] | ApplicationSet controller container-level security context |
10121018
| applicationSet.deploymentAnnotations | object | `{}` | Annotations to be added to ApplicationSet controller Deployment |
1019+
| applicationSet.deploymentStrategy | object | `{}` | Deployment strategy to be added to the ApplicationSet controller Deployment |
10131020
| applicationSet.dnsConfig | object | `{}` | [DNS configuration] |
10141021
| applicationSet.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for ApplicationSet controller pods |
10151022
| applicationSet.enabled | bool | `true` | Enable ApplicationSet controller |
@@ -1095,6 +1102,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
10951102
| notifications.containerSecurityContext | object | See [values.yaml] | Notification controller container-level security Context |
10961103
| notifications.context | object | `{}` | Define user-defined context |
10971104
| notifications.deploymentAnnotations | object | `{}` | Annotations to be applied to the notifications controller Deployment |
1105+
| notifications.deploymentStrategy | object | `{"type":"Recreate"}` | Deployment strategy to be added to the notifications controller Deployment |
10981106
| notifications.dnsConfig | object | `{}` | [DNS configuration] |
10991107
| notifications.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for notifications controller Pods |
11001108
| notifications.enabled | bool | `false` | Enable notifications controller |

‎charts/argo-cd/templates/_common.tpl‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,3 +120,20 @@ nodeAffinity:
120120
{{- end -}}
121121
{{- end -}}
122122
{{- end -}}
123+
124+
{{/*
125+
Common deployment strategy definition
126+
- Recreate don't have additional fields, we need to remove them if added by the mergeOverwrite
127+
*/}}
128+
{{- define "argo-cd.strategy" -}}
129+
{{- $preset := . -}}
130+
{{- if (eq $preset.type "Recreate") }}
131+
type: Recreate
132+
{{- else if (eq $preset.type "RollingUpdate") }}
133+
type: RollingUpdate
134+
{{- with $preset.rollingUpdate }}
135+
rollingUpdate:
136+
{{- toYaml . | nindent 2 }}
137+
{{- end }}
138+
{{- end }}
139+
{{- end -}}

‎charts/argo-cd/templates/argocd-application-controller/statefulset.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,9 @@ spec:
312312
path: tls.key
313313
- key: ca.crt
314314
path: ca.crt
315+
{{- if .Values.controller.hostNetwork }}
315316
hostNetwork: {{ .Values.controller.hostNetwork }}
317+
{{- end }}
316318
{{- with .Values.controller.dnsConfig }}
317319
dnsConfig:
318320
{{- toYaml . | nindent 8 }}

‎charts/argo-cd/templates/argocd-applicationset/deployment.yaml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ metadata:
1212
labels:
1313
{{- include "argo-cd.labels" (dict "context" . "component" .Values.applicationSet.name "name" .Values.applicationSet.name) | nindent 4 }}
1414
spec:
15+
{{- with include "argo-cd.strategy" (mergeOverwrite (deepCopy .Values.global.deploymentStrategy) .Values.applicationSet.deploymentStrategy) }}
16+
strategy:
17+
{{- trim . | nindent 4 }}
18+
{{- end }}
1519
replicas: {{ .Values.applicationSet.replicaCount }}
1620
revisionHistoryLimit: {{ .Values.global.revisionHistoryLimit }}
1721
selector:
@@ -51,8 +55,11 @@ spec:
5155
- name: {{ .Values.applicationSet.name }}
5256
image: {{ default .Values.global.image.repository .Values.applicationSet.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.applicationSet.image.tag }}
5357
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.applicationSet.image.imagePullPolicy }}
58+
{{- if not .Values.global.entrypoint.useImplicit }}
5459
command:
55-
- entrypoint.sh
60+
- {{ .Values.global.entrypoint.entrypoint | quote }}
61+
{{- end }}
62+
args:
5663
- argocd-applicationset-controller
5764
- --metrics-addr=:{{ .Values.applicationSet.containerPorts.metrics }}
5865
- --probe-addr=:{{ .Values.applicationSet.containerPorts.probe }}

‎charts/argo-cd/templates/argocd-notifications/deployment.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ metadata:
1414
spec:
1515
replicas: 1
1616
revisionHistoryLimit: {{ .Values.global.revisionHistoryLimit }}
17+
{{- with include "argo-cd.strategy" (mergeOverwrite (deepCopy .Values.global.deploymentStrategy) .Values.notifications.deploymentStrategy) }}
1718
strategy:
18-
type: Recreate
19+
{{- trim . | nindent 4 }}
20+
{{- end }}
1921
selector:
2022
matchLabels:
2123
{{- include "argo-cd.selectorLabels" (dict "context" . "name" .Values.notifications.name) | nindent 6 }}

‎charts/argo-cd/templates/argocd-repo-server/deployment.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ metadata:
1111
labels:
1212
{{- include "argo-cd.labels" (dict "context" . "component" .Values.repoServer.name "name" .Values.repoServer.name) | nindent 4 }}
1313
spec:
14+
{{- with include "argo-cd.strategy" (mergeOverwrite (deepCopy .Values.global.deploymentStrategy) .Values.repoServer.deploymentStrategy) }}
15+
strategy:
16+
{{- trim . | nindent 4 }}
17+
{{- end }}
1418
{{- if not .Values.repoServer.autoscaling.enabled }}
1519
replicas: {{ .Values.repoServer.replicas }}
1620
{{- end }}
@@ -56,8 +60,10 @@ spec:
5660
- name: {{ .Values.repoServer.name }}
5761
image: {{ default .Values.global.image.repository .Values.repoServer.image.repository }}:{{ default (include "argo-cd.defaultTag" .) .Values.repoServer.image.tag }}
5862
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.repoServer.image.imagePullPolicy }}
63+
{{- if not .Values.global.entrypoint.useImplicit }}
5964
command:
60-
- entrypoint.sh
65+
- {{ .Values.global.entrypoint.entrypoint | quote }}
66+
{{- end }}
6167
args:
6268
- argocd-repo-server
6369
- --port={{ .Values.repoServer.containerPorts.server }}
@@ -355,7 +361,9 @@ spec:
355361
path: tls.key
356362
- key: ca.crt
357363
path: ca.crt
364+
{{- if .Values.repoServer.hostNetwork }}
358365
hostNetwork: {{ .Values.repoServer.hostNetwork }}
366+
{{- end }}
359367
{{- with .Values.repoServer.dnsConfig }}
360368
dnsConfig:
361369
{{- toYaml . | nindent 8 }}

0 commit comments

Comments
 (0)