Skip to content

Commit 2201df4

Browse files
svcAPLBotsvcAPLBot
authored
chore(chart-deps): update argocd to version 9.2.4 (#2827)
1 parent f6b6e36 commit 2201df4

File tree

23 files changed

+87
-32
lines changed

23 files changed

+87
-32
lines changed

‎apps.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ appsInfo:
1212
integration: Alertmanager can be activated to send alerts to configured receivers. It is configured by App Platform to use the global values found under settings/alerts. A team can override global settings to send alerts to their own endpoints.
1313
argocd:
1414
title: Argo CD
15-
appVersion: 3.2.1
15+
appVersion: 3.2.3
1616
repo: https://github.com/argoproj/argo-helm
1717
maintainers: Argo Project
1818
relatedLinks:

‎chart/chart-index/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ version: 0.1.0
66
dependencies:
77
- name: argo-cd
88
alias: argocd
9-
version: 9.1.5
9+
version: 9.2.4
1010
repository: https://argoproj.github.io/argo-helm
1111
- name: argocd-image-updater
1212
version: 1.0.1

‎charts/argocd/Chart.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
annotations:
22
artifacthub.io/changes: |
3-
- kind: changed
4-
description: Bump argo-cd to v3.2.1
3+
- kind: fixed
4+
description: Remove Redis references when redis.enabled=false to prevent CreateContainerConfigError
55
artifacthub.io/signKey: |
66
fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
77
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
88
apiVersion: v2
9-
appVersion: v3.2.1
9+
appVersion: v3.2.3
1010
dependencies:
1111
- condition: redis-ha.enabled
1212
name: redis-ha
@@ -28,4 +28,4 @@ name: argo-cd
2828
sources:
2929
- https://github.com/argoproj/argo-helm/tree/main/charts/argo-cd
3030
- https://github.com/argoproj/argo-cd
31-
version: 9.1.5
31+
version: 9.2.4

‎charts/argocd/README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1100,6 +1100,7 @@ NAME: my-release
11001100
| repoServer.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
11011101
| repoServer.initContainers | list | `[]` | Init containers to add to the repo server pods |
11021102
| repoServer.lifecycle | object | `{}` | Specify postStart and preStop lifecycle hooks for your argo-repo-server container |
1103+
| repoServer.livenessProbe.enabled | bool | `true` | Enable Kubernetes liveness probe for Repo Server |
11031104
| repoServer.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
11041105
| repoServer.livenessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
11051106
| repoServer.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
@@ -1136,6 +1137,7 @@ NAME: my-release
11361137
| repoServer.podLabels | object | `{}` | Labels to be added to repo server pods |
11371138
| repoServer.priorityClassName | string | `""` (defaults to global.priorityClassName) | Priority class for the repo server pods |
11381139
| repoServer.rbac | list | `[]` | Repo server rbac rules |
1140+
| repoServer.readinessProbe.enabled | bool | `true` | Enable Kubernetes readiness probe for Repo Server |
11391141
| repoServer.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
11401142
| repoServer.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
11411143
| repoServer.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
@@ -1217,7 +1219,7 @@ NAME: my-release
12171219
| server.extensions.extensionList | list | `[]` (See [values.yaml]) | Extensions for Argo CD |
12181220
| server.extensions.image.imagePullPolicy | string | `""` (defaults to global.image.imagePullPolicy) | Image pull policy for extensions |
12191221
| server.extensions.image.repository | string | `"quay.io/argoprojlabs/argocd-extension-installer"` | Repository to use for extension installer image |
1220-
| server.extensions.image.tag | string | `"v0.0.8"` | Tag to use for extension installer image |
1222+
| server.extensions.image.tag | string | `"v0.0.9"` | Tag to use for extension installer image |
12211223
| server.extensions.resources | object | `{}` | Resource limits and requests for the argocd-extensions container |
12221224
| server.extraArgs | list | `[]` | Additional command line arguments to pass to Argo CD server |
12231225
| server.extraContainers | list | `[]` | Additional containers to be added to the server pod |
@@ -1272,6 +1274,7 @@ NAME: my-release
12721274
| server.ingressGrpc.tls | bool | `false` | Enable TLS configuration for the hostname defined at `server.ingressGrpc.hostname` |
12731275
| server.initContainers | list | `[]` | Init containers to add to the server pod |
12741276
| server.lifecycle | object | `{}` | Specify postStart and preStop lifecycle hooks for your argo-cd-server container |
1277+
| server.livenessProbe.enabled | bool | `true` | Enable Kubernetes liveness probe for default backend |
12751278
| server.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
12761279
| server.livenessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
12771280
| server.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
@@ -1307,6 +1310,7 @@ NAME: my-release
13071310
| server.podAnnotations | object | `{}` | Annotations to be added to server pods |
13081311
| server.podLabels | object | `{}` | Labels to be added to server pods |
13091312
| server.priorityClassName | string | `""` (defaults to global.priorityClassName) | Priority class for the Argo CD server pods |
1313+
| server.readinessProbe.enabled | bool | `true` | Enable Kubernetes readiness probe for default backend |
13101314
| server.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
13111315
| server.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
13121316
| server.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |

‎charts/argocd/templates/_helpers.tpl‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,9 @@ NOTE: Configuration keys must be stored as dict because YAML treats dot as separ
232232
{{- $presets := dict -}}
233233
{{- $_ := set $presets "repo.server" (printf "%s:%s" (include "argo-cd.repoServer.fullname" .) (.Values.repoServer.service.port | toString)) -}}
234234
{{- $_ := set $presets "server.repo.server.strict.tls" (.Values.repoServer.certificateSecret.enabled | toString ) -}}
235+
{{- if or .Values.redis.enabled .Values.externalRedis.host -}}
235236
{{- $_ := set $presets "redis.server" (include "argo-cd.redis.server" .) -}}
237+
{{- end -}}
236238
{{- $_ := set $presets "applicationsetcontroller.enable.leader.election" (gt ((.Values.applicationSet.replicas | default .Values.applicationSet.replicaCount) | int64) 1) -}}
237239
{{- if .Values.dex.enabled -}}
238240
{{- $_ := set $presets "server.dex.server" (include "argo-cd.dex.server" .) -}}
@@ -319,3 +321,21 @@ key: auth
319321
optional: true
320322
{{- end -}}
321323
{{- end -}}
324+
325+
{{/*
326+
Return the target Kubernetes version
327+
*/}}
328+
{{- define "argo-cd.kubeVersion" -}}
329+
{{- default .Capabilities.KubeVersion.Version .Values.kubeVersionOverride }}
330+
{{- end -}}
331+
332+
{{/*
333+
Return the appropriate apiVersion for monitoring CRDs
334+
*/}}
335+
{{- define "argo-cd.apiVersions.monitoring" -}}
336+
{{- if .Values.apiVersionOverrides.monitoring -}}
337+
{{- print .Values.apiVersionOverrides.monitoring -}}
338+
{{- else -}}
339+
{{- print "monitoring.coreos.com/v1" -}}
340+
{{- end -}}
341+
{{- end -}}

‎charts/argocd/templates/argocd-application-controller/deployment.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -226,6 +226,7 @@ spec:
226226
name: argocd-cmd-params-cm
227227
key: controller.app.state.cache.expiration
228228
optional: true
229+
{{- if or .Values.redis.enabled .Values.externalRedis.host }}
229230
- name: REDIS_SERVER
230231
valueFrom:
231232
configMapKeyRef:
@@ -264,6 +265,7 @@ spec:
264265
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
265266
key: redis-sentinel-password
266267
optional: true
268+
{{- end }}
267269
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
268270
valueFrom:
269271
configMapKeyRef:

‎charts/argocd/templates/argocd-application-controller/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }}
2-
apiVersion: monitoring.coreos.com/v1
1+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
2+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.controller.metrics.enabled .Values.controller.metrics.serviceMonitor.enabled }}
3+
apiVersion: {{ $apiVersion }}
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "argo-cd.controller.fullname" . }}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@ spec:
222222
name: argocd-cmd-params-cm
223223
key: controller.app.state.cache.expiration
224224
optional: true
225+
{{- if or .Values.redis.enabled .Values.externalRedis.host }}
225226
- name: REDIS_SERVER
226227
valueFrom:
227228
configMapKeyRef:
@@ -260,6 +261,7 @@ spec:
260261
name: {{ default (include "argo-cd.redis.fullname" .) .Values.externalRedis.existingSecret }}
261262
key: redis-sentinel-password
262263
optional: true
264+
{{- end }}
263265
- name: ARGOCD_DEFAULT_CACHE_EXPIRATION
264266
valueFrom:
265267
configMapKeyRef:

‎charts/argocd/templates/argocd-applicationset/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.enabled }}
2-
apiVersion: monitoring.coreos.com/v1
1+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
2+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.applicationSet.metrics.enabled .Values.applicationSet.metrics.serviceMonitor.enabled }}
3+
apiVersion: {{ $apiVersion }}
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "argo-cd.applicationSet.fullname" . }}

‎charts/argocd/templates/argocd-notifications/servicemonitor.yaml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
{{- if and (.Capabilities.APIVersions.Has "monitoring.coreos.com/v1") .Values.notifications.enabled .Values.notifications.metrics.enabled .Values.notifications.metrics.serviceMonitor.enabled }}
2-
apiVersion: monitoring.coreos.com/v1
1+
{{- $apiVersion := include "argo-cd.apiVersions.monitoring" . }}
2+
{{- if and (.Capabilities.APIVersions.Has $apiVersion) .Values.notifications.enabled .Values.notifications.metrics.enabled .Values.notifications.metrics.serviceMonitor.enabled }}
3+
apiVersion: {{ $apiVersion }}
34
kind: ServiceMonitor
45
metadata:
56
name: {{ template "argo-cd.notifications.fullname" . }}

0 commit comments

Comments
 (0)