Merge branch 'main' into 2749-server-replicas-env-var

Signed-off-by: Brian Dunnigan <bdun1013dev@gmail.com>

.github/workflows/renovate.yaml

@@ -26,7 +26,7 @@ jobs:
  uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
 
  - name: Self-hosted Renovate
- uses: renovatebot/github-action@76d49712364696a06b60e8647df46b288fff0ddc # v40.2.4
+ uses: renovatebot/github-action@b266b24b144602ed4f512f0773009d026722f4cc # v40.2.6
  with:
  configurationFile: .github/configs/renovate-config.js
  # renovate: datasource=docker depName=ghcr.io/renovatebot/renovate

.github/workflows/scorecard.yml

@@ -60,14 +60,14 @@ jobs:
  # Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
  # format to the repository Actions tab.
  - name: "Upload artifact"
- uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4
+ uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
  with:
  name: SARIF file
  path: results.sarif
  retention-days: 5
 
  # Upload the results to GitHub's code scanning dashboard.
  - name: "Upload to code-scanning"
- uses: github/codeql-action/upload-sarif@afb54ba388a7dca6ecae48f608c4ff05ff4cc77a # v3.25.15
+ uses: github/codeql-action/upload-sarif@429e1977040da7a23b6822b13c129cd1ba93dbb2 # v3.26.2
  with:
  sarif_file: results.sarif

charts/argo-cd/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: v2.11.7
-kubeVersion: ">=1.23.0-0"
+appVersion: v2.12.1
+kubeVersion: ">=1.25.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 7.4.0
+version: 7.5.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:

charts/argo-cd/README.md

@@ -647,7 +647,7 @@ server:
 
 ## Prerequisites
 
-- Kubernetes: `>=1.23.0-0`
+- Kubernetes: `>=1.25.0-0`
  - We align with [Amazon EKS calendar][EKS EoL] because there are many AWS users and it's a conservative approach.
  - Please check [Support Matrix of Argo CD][Kubernetes Compatibility Matrix] for official info.
 - Helm v3.0.0+
@@ -1542,6 +1542,12 @@ If you use an External Redis (See Option 3 above), this Job is not deployed.
 | notifications.image.tag | string | `""` (defaults to global.image.tag) | Tag to use for the notifications controller |
 | notifications.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
 | notifications.initContainers | list | `[]` | Init containers to add to the notifications controller pod |
+| notifications.livenessProbe.enabled | bool | `false` | Enable Kubernetes liveness probe for notifications controller Pods |
+| notifications.livenessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
+| notifications.livenessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
+| notifications.livenessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
+| notifications.livenessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
+| notifications.livenessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
 | notifications.logFormat | string | `""` (defaults to global.logging.format) | Notifications controller log format. Either `text` or `json` |
 | notifications.logLevel | string | `""` (defaults to global.logging.level) | Notifications controller log level. One of: `debug`, `info`, `warn`, `error` |
 | notifications.metrics.enabled | bool | `false` | Enables prometheus metrics server |
@@ -1570,6 +1576,12 @@ If you use an External Redis (See Option 3 above), this Job is not deployed.
 | notifications.podAnnotations | object | `{}` | Annotations to be applied to the notifications controller Pods |
 | notifications.podLabels | object | `{}` | Labels to be applied to the notifications controller Pods |
 | notifications.priorityClassName | string | `""` (defaults to global.priorityClassName) | Priority class for the notifications controller pods |
+| notifications.readinessProbe.enabled | bool | `false` | Enable Kubernetes liveness probe for notifications controller Pods |
+| notifications.readinessProbe.failureThreshold | int | `3` | Minimum consecutive failures for the [probe] to be considered failed after having succeeded |
+| notifications.readinessProbe.initialDelaySeconds | int | `10` | Number of seconds after the container has started before [probe] is initiated |
+| notifications.readinessProbe.periodSeconds | int | `10` | How often (in seconds) to perform the [probe] |
+| notifications.readinessProbe.successThreshold | int | `1` | Minimum consecutive successes for the [probe] to be considered successful after having failed |
+| notifications.readinessProbe.timeoutSeconds | int | `1` | Number of seconds after which the [probe] times out |
 | notifications.resources | object | `{}` | Resource limits and requests for the notifications controller |
 | notifications.secret.annotations | object | `{}` | key:value pairs of annotations to be added to the secret |
 | notifications.secret.create | bool | `true` | Whether helm chart creates notifications controller secret |

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

@@ -207,10 +207,10 @@ spec:
  name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
  {{- if .Values.externalRedis.host }}
  key: redis-password
+ optional: true
  {{- else }}
  key: auth
  {{- end }}
- optional: true
  - name: REDIS_SENTINEL_USERNAME
  valueFrom:
  secretKeyRef:

charts/argo-cd/templates/argocd-applicationset/clusterrole.yaml

@@ -35,6 +35,8 @@ rules:
  - appprojects
  verbs:
  - get
+ - list
+ - watch
  - apiGroups:
  - ""
  resources:

charts/argo-cd/templates/argocd-applicationset/role.yaml

@@ -34,6 +34,8 @@ rules:
  - appprojects
  verbs:
  - get
+ - list
+ - watch
  - apiGroups:
  - ""
  resources:

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

@@ -107,6 +107,26 @@ spec:
  - name: metrics
  containerPort: {{ .Values.notifications.containerPorts.metrics }}
  protocol: TCP
+ {{- if .Values.notifications.livenessProbe.enabled }}
+ livenessProbe:
+ tcpSocket:
+ port: metrics
+ initialDelaySeconds: {{ .Values.notifications.livenessProbe.initialDelaySeconds }}
+ periodSeconds: {{ .Values.notifications.livenessProbe.periodSeconds }}
+ timeoutSeconds: {{ .Values.notifications.livenessProbe.timeoutSeconds }}
+ successThreshold: {{ .Values.notifications.livenessProbe.successThreshold }}
+ failureThreshold: {{ .Values.notifications.livenessProbe.failureThreshold }}
+ {{- end }}
+ {{- if .Values.notifications.readinessProbe.enabled }}
+ readinessProbe:
+ tcpSocket:
+ port: metrics
+ initialDelaySeconds: {{ .Values.notifications.readinessProbe.initialDelaySeconds }}
+ periodSeconds: {{ .Values.notifications.readinessProbe.periodSeconds }}
+ timeoutSeconds: {{ .Values.notifications.readinessProbe.timeoutSeconds }}
+ successThreshold: {{ .Values.notifications.readinessProbe.successThreshold }}
+ failureThreshold: {{ .Values.notifications.readinessProbe.failureThreshold }}
+ {{- end }}
  resources:
  {{- toYaml .Values.notifications.resources | nindent 12 }}
  {{- with .Values.notifications.containerSecurityContext }}

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

@@ -182,9 +182,9 @@ spec:
  valueFrom:
  secretKeyRef:
  name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
- optional: true
  {{- if .Values.externalRedis.host }}
  key: redis-password
+ optional: true
  {{- else }}
  key: auth
  {{- end }}
@@ -290,6 +290,12 @@ spec:
  key: reposerver.revision.cache.lock.timeout
  name: argocd-cmd-params-cm
  optional: true
+ - name: ARGOCD_REPO_SERVER_INCLUDE_HIDDEN_DIRECTORIES
+ valueFrom:
+ configMapKeyRef:
+ key: reposerver.include.hidden.directories
+ name: argocd-cmd-params-cm
+ optional: true
  {{- if .Values.repoServer.useEphemeralHelmWorkingDir }}
  - name: HELM_CACHE_HOME
  value: /helm-working-dir

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

@@ -252,9 +252,9 @@ spec:
  valueFrom:
  secretKeyRef:
  name: {{ default "argocd-redis" .Values.externalRedis.existingSecret }}
- optional: true
  {{- if .Values.externalRedis.host }}
  key: redis-password
+ optional: true
  {{- else }}
  key: auth
  {{- end }}