Merge branch 'main' into per-namespace-controllers

Signed-off-by: Andrii Chubatiuk <andrew.chubatiuk@gmail.com>

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

@@ -13,7 +13,7 @@ jobs:
       options: --user 1001
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
       - name: Run ah lint
         working-directory: ./charts
         run: ah lint
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           fetch-depth: 0
 

.github/workflows/publish.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           fetch-depth: 0
 
@@ -66,7 +66,7 @@ jobs:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
 
       - name: Login to GHCR
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

.github/workflows/renovate.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Get token
-        uses: actions/create-github-app-token@f2acddfb5195534d487896a656232b016a682f3c # v1.9.0
+        uses: actions/create-github-app-token@78e5f2ddc08efcb88fbbee6cfa3fed770ba550c3 # v1.9.1
         id: get_token
         with:
           app-id: ${{ vars.RENOVATE_APP_ID }}
@@ -26,7 +26,7 @@ jobs:
         uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
 
       - name: Self-hosted Renovate
-        uses: renovatebot/github-action@89bd050bafa5a15de5d9383e3129edf210422004 # v40.1.5
+        uses: renovatebot/github-action@23b01dbf6f38965076a36aff87f802263164f204 # v40.1.6
         with:
           configurationFile: .github/configs/renovate-config.js
           # renovate: datasource=docker depName=ghcr.io/renovatebot/renovate

.github/workflows/scorecard.yml

@@ -33,7 +33,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2
         with:
           persist-credentials: false
 

charts/argo-cd/Chart.yaml

@@ -1,9 +1,9 @@
 apiVersion: v2
-appVersion: v2.10.3
+appVersion: v2.10.4
 kubeVersion: ">=1.23.0-0"
 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 6.7.2
+version: 6.7.3
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 sources:
@@ -27,4 +27,4 @@ annotations:
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: changed
-      description: Bump argo-cd to v2.10.3
+      description: Bump argo-cd to v2.10.4

charts/argo-events/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v1.9.1
 description: A Helm chart for Argo Events, the event-driven workflow automation framework
 name: argo-events
-version: 2.4.3
+version: 2.4.4
 home: https://github.com/argoproj/argo-helm
 icon: https://avatars.githubusercontent.com/u/30269780?s=200&v=4
 keywords:
@@ -18,5 +18,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: changed
+    - kind: added
-      description: Bump argo-events to v1.9.1
+      description: Support ability to set .Values.namespaceOverride

charts/argo-events/README.md

@@ -87,6 +87,7 @@ done
 | global.podLabels | object | `{}` | Labels for the all deployed pods |
 | global.securityContext | object | `{}` | Toggle and define securityContext. See [values.yaml] |
 | nameOverride | string | `"argo-events"` | Provide a name in place of `argo-events` |
+| namespaceOverride | string | `.Release.Namespace` | Override the namespace |
 | openshift | bool | `false` | Deploy on OpenShift |
 
 ### Controller

charts/argo-events/templates/_helpers.tpl

@@ -136,3 +136,11 @@ Define Pdb apiVersion
 {{- printf "policy/v1beta1" -}}
 {{- end }}
 {{- end }}
+
+{{/*
+Expand the namespace of the release.
+Allows overriding it for multi-namespace deployments in combined charts.
+*/}}
+{{- define "argo-events.namespace" -}}
+{{- default .Release.Namespace .Values.namespaceOverride | trunc 63 | trimSuffix "-" -}}
+{{- end }}

charts/argo-events/templates/argo-events-controller/config.yaml

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "argo-events.controller.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   labels:
     {{- include "argo-events.labels" (dict "context" . "name" .Values.controller.name) | nindent 4 }}
 data:

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

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: {{ include "argo-events.controller.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   labels:
     {{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
     app.kubernetes.io/version: {{ include "argo-events.controller_chart_version_label" . }}

charts/argo-events/templates/argo-events-controller/pdb.yaml

@@ -3,7 +3,7 @@ apiVersion: {{ template "argo-events.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "argo-events.controller.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   labels:
     {{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
     {{- with .Values.controller.pdb.labels }}

charts/argo-events/templates/argo-events-controller/rbac.yaml

@@ -4,7 +4,7 @@ kind: {{ .Values.controller.rbac.namespaced | ternary "Role" "ClusterRole" }}
 metadata:
   name: {{ include "argo-events.controller.fullname" . }}
   {{- if .Values.controller.rbac.namespaced }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   {{- end }}
   labels:
     {{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
@@ -122,5 +122,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "argo-events.controller.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
 {{- end }}

charts/argo-events/templates/argo-events-controller/service.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: {{ template "argo-events.controller.fullname" . }}-metrics
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   {{- with .Values.controller.metrics.service.annotations }}
   annotations:
     {{- range $key, $value := . }}

charts/argo-events/templates/argo-events-controller/serviceaccount.yaml

@@ -4,7 +4,7 @@ kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.controller.serviceAccount.automountServiceAccountToken }}
 metadata:
   name: {{ include "argo-events.controller.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   {{- with .Values.controller.serviceAccount.annotations }}
   annotations:
     {{- range $key, $value := . }}

charts/argo-events/templates/argo-events-controller/servicemonitor.yaml

@@ -3,7 +3,7 @@ apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   name: {{ template "argo-events.controller.fullname" . }}
-  namespace: {{ default .Release.Namespace .Values.controller.metrics.serviceMonitor.namespace | quote }}
+  namespace: {{ default (include "argo-events.namespace" .) .Values.controller.metrics.serviceMonitor.namespace | quote }}
   labels:
     {{- include "argo-events.labels" (dict "context" . "component" .Values.controller.name "name" .Values.controller.name) | nindent 4 }}
     {{- with .Values.controller.metrics.serviceMonitor.selector }}
@@ -29,7 +29,7 @@ spec:
       {{- end }}
   namespaceSelector:
     matchNames:
-      - {{ .Release.Namespace | quote }}
+      - {{ include "argo-events.namespace" . | quote }}
   selector:
     matchLabels:
       {{- include "argo-events.selectorLabels" (dict "context" . "component" .Values.controller.name "name" (printf "%s-metrics" .Values.controller.name)) | nindent 6 }}

charts/argo-events/templates/argo-events-webhook/clusterrolebinding.yaml

@@ -12,5 +12,5 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: {{ include "argo-events.webhook.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
 {{- end }}

charts/argo-events/templates/argo-events-webhook/deployment.yaml

@@ -3,7 +3,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: events-webhook
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   labels:
     {{- include "argo-events.labels" (dict "context" . "component" .Values.webhook.name "name" .Values.webhook.name) | nindent 4 }}
     app.kubernetes.io/version: {{ include "argo-events.webhook_chart_version_label" . }}

charts/argo-events/templates/argo-events-webhook/pdb.yaml

@@ -3,7 +3,7 @@ apiVersion: {{ template "argo-events.pdb.apiVersion" . }}
 kind: PodDisruptionBudget
 metadata:
   name: {{ template "argo-events.webhook.fullname" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   labels:
     {{- include "argo-events.labels" (dict "context" . "component" .Values.webhook.name "name" .Values.webhook.name) | nindent 4 }}
     {{- with .Values.webhook.pdb.labels }}

charts/argo-events/templates/argo-events-webhook/service.yaml

@@ -3,7 +3,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: events-webhook
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   labels:
     {{- include "argo-events.labels" (dict "context" . "name" .Values.webhook.name) | nindent 4 }}
 spec:

charts/argo-events/templates/argo-events-webhook/serviceaccount.yaml

@@ -4,7 +4,7 @@ kind: ServiceAccount
 automountServiceAccountToken: {{ .Values.webhook.serviceAccount.automountServiceAccountToken }}
 metadata:
   name: {{ include "argo-events.webhook.serviceAccountName" . }}
-  namespace: {{ .Release.Namespace | quote }}
+  namespace: {{ include "argo-events.namespace" . | quote }}
   {{- with .Values.webhook.serviceAccount.annotations }}
   annotations:
     {{- range $key, $value := . }}

charts/argo-events/values.yaml

@@ -6,6 +6,9 @@
 nameOverride: argo-events
 # -- String to fully override "argo-events.fullname" template
 fullnameOverride: ""
+# -- Override the namespace
+# @default -- `.Release.Namespace`
+namespaceOverride: ""
 
 # -- Deploy on OpenShift
 openshift: false

charts/argo-rollouts/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v1.6.6
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 2.34.3
+version: 2.35.1
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
 keywords:
@@ -18,5 +18,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: changed
+    - kind: added
-      description: Bump argo-rollouts to v1.6.6
+      description: Allow minimum set of RBAC rules for Gateway API resources

charts/argo-rollouts/README.md

@@ -50,6 +50,7 @@ For full list of changes please check ArtifactHub [changelog].
 | extraObjects | list | `[]` | Additional manifests to deploy within the chart. A list of objects. |
 | fullnameOverride | string | `nil` | String to fully override "argo-rollouts.fullname" template |
 | global.deploymentAnnotations | object | `{}` | Annotations for all deployed Deployments |
+| global.deploymentLabels | object | `{}` | Labels for all deployed Deployments |
 | imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry. Registry secret names as an array. |
 | installCRDs | bool | `true` | Install and upgrade CRDs |
 | keepCRDs | bool | `true` | Keep CRD's on helm uninstall |
@@ -60,12 +61,14 @@ For full list of changes please check ArtifactHub [changelog].
 | notifications.secret.items | object | `{}` | Generic key:value pairs to be inserted into the notifications secret |
 | notifications.templates | object | `{}` | Notification templates |
 | notifications.triggers | object | `{}` | The trigger defines the condition when the notification should be sent |
+| providerRBAC.additionalRules | list | `[]` | Additional RBAC rules for others providers |
 | providerRBAC.enabled | bool | `true` | Toggles addition of provider-specific RBAC rules to the controller Role and ClusterRole |
 | providerRBAC.providers.ambassador | bool | `true` | Adds RBAC rules for the Ambassador provider |
 | providerRBAC.providers.apisix | bool | `true` | Adds RBAC rules for the Apisix provider |
 | providerRBAC.providers.awsAppMesh | bool | `true` | Adds RBAC rules for the AWS App Mesh provider |
 | providerRBAC.providers.awsLoadBalancerController | bool | `true` | Adds RBAC rules for the AWS Load Balancer Controller provider |
 | providerRBAC.providers.contour | bool | `true` | Adds RBAC rules for the Contour provider, see `https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-contour/blob/main/README.md` |
+| providerRBAC.providers.gatewayAPI | bool | `true` | Adds RBAC rules for the Gateway API provider |
 | providerRBAC.providers.glooPlatform | bool | `true` | Adds RBAC rules for the Gloo Platform provider, see `https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-glooplatform/blob/main/README.md` |
 | providerRBAC.providers.istio | bool | `true` | Adds RBAC rules for the Istio provider |
 | providerRBAC.providers.smi | bool | `true` | Adds RBAC rules for the SMI provider |
@@ -82,6 +85,7 @@ For full list of changes please check ArtifactHub [changelog].
 | controller.containerPorts.metrics | int | `8090` | Metrics container port |
 | controller.createClusterRole | bool | `true` | flag to enable creation of cluster controller role (requires cluster RBAC) |
 | controller.deploymentAnnotations | object | `{}` | Annotations to be added to the controller deployment |
+| controller.deploymentLabels | object | `{}` | Labels to be added to the controller deployment |
 | controller.extraArgs | list | `[]` | Additional command line arguments to pass to rollouts-controller.  A list of flags. |
 | controller.extraContainers | list | `[]` | Literal yaml for extra containers to be added to controller deployment. |
 | controller.extraEnv | list | `[]` | Additional environment variables for rollouts-controller. A list of name/value maps. |
@@ -138,6 +142,7 @@ For full list of changes please check ArtifactHub [changelog].
 | dashboard.containerSecurityContext | object | `{}` | Security Context to set on container level |
 | dashboard.createClusterRole | bool | `true` | flag to enable creation of dashbord cluster role (requires cluster RBAC) |
 | dashboard.deploymentAnnotations | object | `{}` | Annotations to be added to the dashboard deployment |
+| dashboard.deploymentLabels | object | `{}` | Labels to be added to the dashboard deployment |
 | dashboard.enabled | bool | `false` | Deploy dashboard server |
 | dashboard.extraArgs | list | `[]` | Additional command line arguments to pass to rollouts-dashboard. A list of flags. |
 | dashboard.extraEnv | list | `[]` | Additional environment variables for rollouts-dashboard. A list of name/value maps. |

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

@@ -94,11 +94,22 @@ rules:
   - ""
   resources:
   - secrets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
   - configmaps
   verbs:
   - get
   - list
   - watch
+{{- if .Values.providerRBAC.providers.gatewayAPI }}
+  - create
+  - update
+{{- end }}  
 # pod list/update needed for updating ephemeral data
 - apiGroups:
   - ""
@@ -276,5 +287,24 @@ rules:
   verbs:
   - '*'
 {{- end }}
+{{- if .Values.providerRBAC.providers.gatewayAPI }}
+  # Access needed when using the Gateway API provider
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - httproutes
+  - tcproutes
+  - tlsroutes
+  - udproutes
+  - grpcroutes
+  verbs:
+  - get
+  - list
+  - watch
+  - update
+{{- end }}
+{{- with .Values.providerRBAC.additionalRules }}
+{{ toYaml .  }}
+{{- end }}
 {{- end }}
 {{- end }}

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

@@ -10,6 +10,9 @@ metadata:
   name: {{ include "argo-rollouts.fullname" . }}
   namespace: {{ .Release.Namespace | quote }}
   labels:
+  {{- range $key, $value := (mergeOverwrite (deepCopy .Values.global.deploymentLabels) .Values.controller.deploymentLabels) }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
     app.kubernetes.io/component: {{ .Values.controller.component }}
     {{- include "argo-rollouts.labels" . | nindent 4 }}
 spec:

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

@@ -95,11 +95,22 @@ rules:
   - ""
   resources:
   - secrets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ""
+  resources:
   - configmaps
   verbs:
   - get
   - list
   - watch
+{{- if .Values.providerRBAC.providers.gatewayAPI }}
+  - create
+  - update
+{{- end }}  
 # pod list/update needed for updating ephemeral data
 - apiGroups:
   - ""
@@ -265,5 +276,21 @@ rules:
   verbs:
   - '*'
 {{- end }}
+{{- if .Values.providerRBAC.providers.gatewayAPI }}
+  # Access needed when using the Gateway API provider
+- apiGroups:
+  - gateway.networking.k8s.io
+  resources:
+  - httproutes
+  - tcproutes
+  - tlsroutes
+  - udproutes
+  - grpcroutes
+  verbs:
+  - get
+  - list
+  - watch
+  - update
+{{- end }}
 {{- end }}
 {{- end }}

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

@@ -11,6 +11,9 @@ metadata:
   name: {{ include "argo-rollouts.fullname" . }}-dashboard
   namespace: {{ .Release.Namespace | quote }}
   labels:
+  {{- range $key, $value := (mergeOverwrite (deepCopy .Values.global.deploymentLabels) .Values.dashboard.deploymentLabels) }}
+    {{ $key }}: {{ $value | quote }}
+  {{- end }}
     app.kubernetes.io/component: {{ .Values.dashboard.component }}
     {{- include "argo-rollouts.labels" . | nindent 4 }}
 spec:

charts/argo-rollouts/values.yaml

@@ -41,12 +41,16 @@ extraObjects: []
 global:
   # -- Annotations for all deployed Deployments
   deploymentAnnotations: {}
+  # -- Labels for all deployed Deployments
+  deploymentLabels: {}
 
 controller:
   # -- Value of label `app.kubernetes.io/component`
   component: rollouts-controller
   # -- Annotations to be added to the controller deployment
   deploymentAnnotations: {}
+  # -- Labels to be added to the controller deployment
+  deploymentLabels: {}
   # -- Annotations to be added to application controller pods
   podAnnotations: {}
   # -- [Node selector]
@@ -273,6 +277,10 @@ providerRBAC:
     contour: true
     # -- Adds RBAC rules for the Gloo Platform provider, see `https://github.com/argoproj-labs/rollouts-plugin-trafficrouter-glooplatform/blob/main/README.md`
     glooPlatform: true
+    # -- Adds RBAC rules for the Gateway API provider
+    gatewayAPI: true
+  # -- Additional RBAC rules for others providers
+  additionalRules: []
 
 dashboard:
   # -- Deploy dashboard server
@@ -283,6 +291,8 @@ dashboard:
   component: rollouts-dashboard
   # -- Annotations to be added to the dashboard deployment
   deploymentAnnotations: {}
+  # -- Labels to be added to the dashboard deployment
+  deploymentLabels: {}
   # -- Annotations to be added to application dashboard pods
   podAnnotations: {}
   # -- [Node selector]

charts/argo-workflows/Chart.yaml

@@ -3,7 +3,7 @@ appVersion: v3.5.5
 name: argo-workflows
 description: A Helm chart for Argo Workflows
 type: application
-version: 0.40.14
+version: 0.41.0
 icon: https://argo-workflows.readthedocs.io/en/stable/assets/logo.png
 home: https://github.com/argoproj/argo-helm
 sources:
@@ -17,4 +17,4 @@ annotations:
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: added
-      description: Support namespaceOverride
+      description: Check Prometheus CRDs are available before creating Service Monitor resource(s)

charts/argo-workflows/README.md

@@ -111,6 +111,7 @@ Fields to note:
 |-----|------|---------|-------------|
 | apiVersionOverrides.autoscaling | string | `""` | String to override apiVersion of autoscaling rendered by this helm chart |
 | apiVersionOverrides.cloudgoogle | string | `""` | String to override apiVersion of GKE resources rendered by this helm chart |
+| apiVersionOverrides.monitoring | string | `""` | String to override apiVersion of monitoring CRDs (ServiceMonitor) rendered by this helm chart |
 | commonLabels | object | `{}` | Labels to set on all resources |
 | crds.annotations | object | `{}` | Annotations to be added to all CRDs |
 | crds.install | bool | `true` | Install and upgrade CRDs |

charts/argo-workflows/templates/_helpers.tpl

@@ -190,6 +190,17 @@ Return the appropriate apiVersion for GKE resources
 {{- end -}}
 {{- end -}}
 
+{{/*
+Return the appropriate apiVersion for monitoring CRDs
+*/}}
+{{- define "argo-workflows.apiVersions.monitoring" -}}
+{{- if .Values.apiVersionOverrides.monitoring -}}
+{{- print .Values.apiVersionOverrides.monitoring -}}
+{{- else -}}
+{{- print "monitoring.coreos.com/v1" -}}
+{{- end -}}
+{{- end -}}
+
 {{/*
 Expand the namespace of the release.
 Allows overriding it for multi-namespace deployments in combined charts.

charts/argo-workflows/templates/controller/workflow-controller-servicemonitor.yaml

@@ -1,8 +1,10 @@
 {{- if and (or .Values.controller.metricsConfig.enabled .Values.controller.telemetryConfig.enabled) .Values.controller.serviceMonitor.enabled }}
 {{ $namespaces := keys (deepCopy $.Values.controllers | merge (dict (include "argo-workflows.namespace" $) $.Values.controller)) }}
 {{- $context := merge (dict "controller" $.Values.controller) $ }}
-
+{{- $apiVersion := include "argo-workflows.apiVersions.monitoring" . }}
-apiVersion: monitoring.coreos.com/v1
+{{- if and (.Capabilities.APIVersions.Has $apiVersion) (or .Values.controller.metricsConfig.enabled .Values.controller.telemetryConfig.enabled) .Values.controller.serviceMonitor.enabled }}
+---
+apiVersion: {{ $apiVersion }}
 kind: ServiceMonitor
 metadata:
   name: {{ template "argo-workflows.controller.fullname" $context }}
@@ -50,3 +52,4 @@ spec:
     matchLabels:
       {{- include "argo-workflows.selectorLabels" (dict "context" $context "name" $.Values.controller.name) | nindent 6 }}
 {{- end }}
+{{- end }}

charts/argo-workflows/values.yaml

@@ -42,6 +42,8 @@ apiVersionOverrides:
   autoscaling: "" # autoscaling/v2
   # -- String to override apiVersion of GKE resources rendered by this helm chart
   cloudgoogle: "" # cloud.google.com/v1
+  # -- String to override apiVersion of monitoring CRDs (ServiceMonitor) rendered by this helm chart
+  monitoring: "" # monitoring.coreos.com/v1
 
 # -- Restrict Argo to operate only in a single namespace (the namespace of the
 # Helm release) by apply Roles and RoleBindings instead of the Cluster

charts/argocd-apps/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-apps
 description: A Helm chart for managing additional Argo CD Applications and Projects
 type: application
-version: 1.6.2
+version: 2.0.0
 home: https://github.com/argoproj/argo-helm
 icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
 keywords:
@@ -18,4 +18,4 @@ annotations:
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
     - kind: added
-      description: Support Template Patch to ApplicationSet
+      description: make the chart use maps instead of lists

charts/argocd-apps/README.md

@@ -28,11 +28,11 @@ $ helm install my-release argo/argocd-apps
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| applications | list | `[]` (See [values.yaml]) | Deploy Argo CD Applications within this helm release |
+| applications | object | `{}` (See [values.yaml]) | Deploy Argo CD Applications within this helm release |
-| applicationsets | list | `[]` (See [values.yaml]) | Deploy Argo CD ApplicationSets within this helm release |
+| applicationsets | object | `{}` (See [values.yaml]) | Deploy Argo CD ApplicationSets within this helm release |
-| extensions | list | `[]` (See [values.yaml]) | DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info. |
+| extensions | object | `{}` (See [values.yaml]) | DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info. |
 | itemTemplates | list | `[]` (See [values.yaml]) | Deploy Argo CD Applications/ApplicationSets/Projects within this helm release |
-| projects | list | `[]` (See [values.yaml]) | Deploy Argo CD Projects within this helm release |
+| projects | object | `{}` (See [values.yaml]) | Deploy Argo CD Projects within this helm release |
 
 ----------------------------------------------
 Autogenerated from chart metadata using [helm-docs](https://github.com/norwoodj/helm-docs)

charts/argocd-apps/ci/applications-multiple-sources-values.yaml

@@ -1,7 +1,7 @@
 #  Test with multi-source applications
 
 applications:
-- name: argocd-application-multiple-sources
+  argocd-application-multiple-sources:
     additionalLabels: {}
     additionalAnnotations: {}
     finalizers:

charts/argocd-apps/ci/applications-values.yaml

@@ -1,7 +1,7 @@
 #  Test with applications
 
 applications:
-- name: argocd-application
+  argocd-application:
     additionalLabels: {}
     additionalAnnotations: {}
     finalizers:

charts/argocd-apps/ci/applicationsets-multiple-sources-values.yaml

@@ -1,7 +1,7 @@
 # Test with multi-source applicationsets
 
 applicationsets:
-- name: applicationset-multiple-sources
+  applicationset-multiple-sources:
     generators:
     - list:
         elements:

charts/argocd-apps/ci/applicationsets-progressive-syncs-values.yaml

@@ -1,7 +1,7 @@
 # Test applicationsets with Progressive Syncs
 
 applicationsets:
-- name: applicationset-progressive-syncs
+  applicationset-progressive-syncs:
     generators:
     - list:
         elements:

charts/argocd-apps/ci/applicationsets-values.yaml

@@ -1,7 +1,7 @@
 # Test with applicationsets
 
 applicationsets:
-- name: applicationset
+  applicationset:
     additionalLabels: {}
     additionalAnnotations: {}
     # See PR #10026 (ArgoCD v2.5 or later)
@@ -59,7 +59,7 @@ applicationsets:
           automated:
             prune: {{ .prune }}
       {{- end }}
-- name: applicationset-list-generator
+  applicationset-list-generator:
     generators:
     - list:
         elements:

charts/argocd-apps/templates/applications.yaml

@@ -1,50 +1,50 @@
-{{- range .Values.applications }}
+{{- range $appName, $appData:= .Values.applications }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  {{- with .additionalAnnotations }}
+  {{- with $appData.additionalAnnotations }}
   annotations:
     {{- range $key, $value := . }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
   {{- end }}
-  {{- with .additionalLabels }}
+  {{- with $appData.additionalLabels }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  name: {{ .name }}
+  name: {{ $appName }}
-  {{- with .namespace }}
+  {{- with $appData.namespace }}
   namespace: {{ . }}
   {{- end }}
-  {{- with .finalizers }}
+  {{- with $appData.finalizers }}
   finalizers:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  project: {{ tpl .project $ }}
+  project: {{ tpl $appData.project $ }}
-  {{- with .source }}
+  {{- with $appData.source }}
   source:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .sources }}
+  {{- with $appData.sources }}
   sources:
     {{- toYaml . | nindent 4 }}
   {{- end }}
   destination:
-    {{- toYaml .destination | nindent 4 }}
+    {{- toYaml $appData.destination | nindent 4 }}
-  {{- with .syncPolicy }}
+  {{- with $appData.syncPolicy }}
   syncPolicy:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .revisionHistoryLimit }}
+  {{- with $appData.revisionHistoryLimit }}
   revisionHistoryLimit: {{ . }}
   {{- end }}
-  {{- with .ignoreDifferences }}
+  {{- with $appData.ignoreDifferences }}
   ignoreDifferences:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .info }}
+  {{- with $appData.info }}
   info:
     {{- toYaml . | nindent 4 }}
   {{- end }}

charts/argocd-apps/templates/applicationsets.yaml

@@ -1,44 +1,43 @@
-
+{{- range $appSetName, $appSetData:= .Values.applicationsets }}
-{{- range .Values.applicationsets }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: ApplicationSet
 metadata:
-  {{- with .additionalAnnotations }}
+  {{- with $appSetData.additionalAnnotations }}
   annotations:
     {{- range $key, $value := . }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
   {{- end }}
-  {{- with .additionalLabels }}
+  {{- with $appSetData.additionalLabels }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  name: {{ .name }}
+  name: {{ $appSetName }}
-  {{- with .namespace }}
+  {{- with $appSetData.namespace }}
   namespace: {{ . }}
   {{- end }}
 spec:
-  {{- if hasKey . "goTemplate" }}
+  {{- if hasKey $appSetData "goTemplate" }}
-  goTemplate: {{ .goTemplate }}
+  goTemplate: {{ $appSetData.goTemplate }}
   {{- end }}
-  {{- with .generators }}
+  {{- with $appSetData.generators }}
   generators:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .ignoreApplicationDifferences }}
+  {{- with $appSetData.ignoreApplicationDifferences }}
   ignoreApplicationDifferences:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .strategy }}
+  {{- with $appSetData.strategy }}
   strategy:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .syncPolicy }}
+  {{- with $appSetData.syncPolicy }}
   syncPolicy:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .template }}
+  {{- with $appSetData.template }}
   template:
     {{- with .metadata }}
     metadata:
@@ -84,7 +83,7 @@ spec:
       {{- end }}
     {{- end -}}
   {{- end }}
-  {{- with .templatePatch }}
+  {{- with $appSetData.templatePatch }}
   templatePatch: |
     {{- . | nindent 4 }}
   {{- end }}

charts/argocd-apps/templates/extensions.yaml

@@ -1,25 +1,25 @@
-{{- range .Values.extensions }}
+{{- range $extensionName, $extensionData:= .Values.extensions }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: ArgoCDExtension
 metadata:
-  name: {{ .name }}
+  name: {{ $extensionName }}
-  {{- with .namespace }}
+  {{- with $extensionData.namespace }}
   namespace: {{ . }}
   {{- end }}
   finalizers:
     - extensions-finalizer.argocd.argoproj.io
-  {{- with .additionalLabels }}
+  {{- with $extensionData.additionalLabels }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .additionalAnnotations }}
+  {{- with $extensionData.additionalAnnotations }}
   annotations:
     {{- range $key, $value := . }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
   {{- end }}
-{{- with .sources }}
+{{- with $extensionData.sources }}
 spec:
   sources:
     {{- toYaml . | nindent 4 }}

charts/argocd-apps/templates/projects.yaml

@@ -1,72 +1,72 @@
-{{- range .Values.projects }}
+{{- range $projectName, $projectData := .Values.projects }}
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: AppProject
 metadata:
-  {{- with .additionalAnnotations }}
+  {{- with $projectData.additionalAnnotations }}
   annotations:
     {{- range $key, $value := . }}
     {{ $key }}: {{ $value | quote }}
     {{- end }}
   {{- end }}
-  {{- with .additionalLabels }}
+  {{- with $projectData.additionalLabels }}
   labels:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  name: {{ .name }}
+  name: {{ $projectName }}
-  {{- with .namespace }}
+  {{- with $projectData.namespace }}
   namespace: {{ . }}
   {{- end }}
-  {{- with .finalizers }}
+  {{- with $projectData.finalizers }}
   finalizers:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-  {{- with .permitOnlyProjectScopedClusters }}
+  {{- with $projectData.permitOnlyProjectScopedClusters }}
   permitOnlyProjectScopedClusters: {{ . }}
   {{- end }}
-  description: {{ .description }}
+  description: {{ $projectData.description }}
-  {{- with .sourceRepos }}
+  {{- with $projectData.sourceRepos }}
   sourceRepos:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .destinations }}
+  {{- with $projectData.destinations }}
   destinations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .clusterResourceWhitelist }}
+  {{- with $projectData.clusterResourceWhitelist }}
   clusterResourceWhitelist:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .clusterResourceBlacklist }}
+  {{- with $projectData.clusterResourceBlacklist }}
   clusterResourceBlacklist:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .namespaceResourceBlacklist }}
+  {{- with $projectData.namespaceResourceBlacklist }}
   namespaceResourceBlacklist:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .namespaceResourceWhitelist }}
+  {{- with $projectData.namespaceResourceWhitelist }}
   namespaceResourceWhitelist:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .orphanedResources }}
+  {{- with $projectData.orphanedResources }}
   orphanedResources:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .roles }}
+  {{- with $projectData.roles }}
   roles:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .syncWindows }}
+  {{- with $projectData.syncWindows }}
   syncWindows:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .signatureKeys }}
+  {{- with $projectData.signatureKeys }}
   signatureKeys:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-  {{- with .sourceNamespaces }}
+  {{- with $projectData.sourceNamespaces }}
   sourceNamespaces:
     {{- toYaml . | nindent 4 }}
   {{- end }}

charts/argocd-apps/values.yaml

@@ -1,8 +1,8 @@
 # -- Deploy Argo CD Applications within this helm release
-# @default -- `[]` (See [values.yaml])
+# @default -- `{}` (See [values.yaml])
 ## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/
-applications: []
+applications: {}
-# - name: guestbook
+#  guestbook:
 #    namespace: argocd
 #    additionalLabels: {}
 #    additionalAnnotations: {}
@@ -43,10 +43,10 @@ applications: []
 #      value: https://argoproj.github.io/
 
 # -- Deploy Argo CD Projects within this helm release
-# @default -- `[]` (See [values.yaml])
+# @default -- `{}` (See [values.yaml])
 ## Ref: https://github.com/argoproj/argo-cd/blob/master/docs/operator-manual/
-projects: []
+projects: {}
-# - name: guestbook
+#  guestbook:
 #    namespace: argocd
 #    additionalLabels: {}
 #    additionalAnnotations: {}
@@ -90,10 +90,10 @@ projects: []
 #    - argocd
 
 # -- Deploy Argo CD ApplicationSets within this helm release
-# @default -- `[]` (See [values.yaml])
+# @default -- `{}` (See [values.yaml])
 ## Ref: https://argo-cd.readthedocs.io/en/stable/operator-manual/applicationset/
-applicationsets: []
+applicationsets: {}
-# - name: guestbook
+#  guestbook:
 #    namespace: argocd
 #    additionalLabels: {}
 #    additionalAnnotations: {}
@@ -238,16 +238,16 @@ itemTemplates: []
 #             namespace: guestbook
 
 # -- DEPRECATED - Please refer [Deprecation Notice](https://github.com/argoproj-labs/argocd-extensions?tab=readme-ov-file#deprecation-notice) for more info.
-# @default -- `[]` (See [values.yaml])
+# @default -- `{}` (See [values.yaml])
 ## This function in tech preview stage, do expect unstability or breaking changes in newer versions. Bump image.tag if necessary.
 ## Ref: https://github.com/argoproj-labs/argocd-extensions
-extensions: []
+extensions: {}
-  # - name: example
+#  example:
-  #   namespace: argocd
+#    namespace: argocd
-  #   additionalLabels: {}
+#    additionalLabels: {}
-  #   additionalAnnotations: {}
+#    additionalAnnotations: {}
-  #   sources:
+#    sources:
-  #     - git:
+#      - git:
-  #         url: https://github.com/argoproj-labs/argocd-example-extension.git
+#          url: https://github.com/argoproj-labs/argocd-example-extension.git
-  #     - web:
+#      - web:
-  #         url: https://github.com/argoproj-labs/argocd-example-extension/releases/download/v0.1.0/extension.tar
+#          url: https://github.com/argoproj-labs/argocd-example-extension/releases/download/v0.1.0/extension.tar

charts/argocd-image-updater/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: argocd-image-updater
 description: A Helm chart for Argo CD Image Updater, a tool to automatically update the container images of Kubernetes workloads which are managed by Argo CD
 type: application
-version: 0.9.5
+version: 0.9.6
 appVersion: v0.12.2
 home: https://github.com/argoproj-labs/argocd-image-updater
 icon: https://argocd-image-updater.readthedocs.io/en/stable/assets/logo.png
@@ -18,5 +18,9 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: added
+    - kind: fixed
-      description: Allow overriding of .Release.Namespace with .Values.namespaceOverride
+      description: Properly quoting the config map values
+    - kind: fixed
+      description: Only adding a data field to argocd-image-updater-ssh-config when there's data to be added
+    - kind: changed
+      description: Only include config.argocd if config.applicationsAPIKind is set to 'argocd'

charts/argocd-image-updater/templates/configmap-sshconfig.yaml

@@ -5,7 +5,7 @@ metadata:
     {{- include "argocd-image-updater.labels" . | nindent 4 }}
   name: argocd-image-updater-ssh-config
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
+{{- with .Values.config.sshConfig }}
 data:
-  {{- with .Values.config.sshConfig }}
   {{- toYaml . | nindent 2 }}
-  {{- end }}
+{{- end }}

charts/argocd-image-updater/templates/configmap.yaml

@@ -8,30 +8,32 @@ metadata:
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
 data:
   {{- with .Values.config.applicationsAPIKind }}
-  applications_api: {{ . }}
+  applications_api: {{ . | quote }}
+  {{- if eq . "argocd" }}
+  argocd.grpc_web: {{ $.Values.config.argocd.grpcWeb | quote }}
+  {{- with $.Values.config.argocd.serverAddress }}
+  argocd.server_addr: {{ . | quote }}
   {{- end }}
-  argocd.grpc_web: {{ .Values.config.argocd.grpcWeb | quote }}
+  argocd.insecure: {{ $.Values.config.argocd.insecure | quote }}
-  {{- with .Values.config.argocd.serverAddress }}
+  argocd.plaintext: {{ $.Values.config.argocd.plaintext | quote }}
-  argocd.server_addr: {{ . }}
+  {{- end -}}
   {{- end }}
-  argocd.insecure: {{ .Values.config.argocd.insecure | quote }}
-  argocd.plaintext: {{ .Values.config.argocd.plaintext | quote }}
   {{- with .Values.config.logLevel }}
-  log.level: {{ . }}
+  log.level: {{ . | quote }}
   {{- end }}
   {{- with .Values.config.gitCommitUser }}
-  git.user: {{ . }}
+  git.user: {{ . | quote }}
   {{- end }}
   {{- with .Values.config.gitCommitMail }}
-  git.email: {{ . }}
+  git.email: {{ . | quote }}
   {{- end }}
   {{- with .Values.config.gitCommitTemplate }}
   git.commit-message-template: |
     {{- nindent 4 . }}
   {{- end }}
   kube.events: {{ .Values.config.disableKubeEvents | quote }}
-  registries.conf: |
   {{- with .Values.config.registries }}
+  registries.conf: |
     registries:
       {{- toYaml . | nindent 6 }}
   {{- end }}

charts/argocd-image-updater/templates/rbac.yaml

@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   labels:
-    {{ include "argocd-image-updater.labels" . | nindent 4 }}
+    {{- include "argocd-image-updater.labels" . | nindent 4 }}
   name: {{ include "argocd-image-updater.fullname" . }}
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
 rules:
@@ -37,7 +37,7 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
-    {{ include "argocd-image-updater.labels" . | nindent 4 }}
+    {{- include "argocd-image-updater.labels" . | nindent 4 }}
   name: {{ include "argocd-image-updater.fullname" . }}
   namespace: {{ include "argocd-image-updater.namespace" . | quote }}
 roleRef:

charts/argocd-image-updater/values.yaml

@@ -101,6 +101,7 @@ config:
   applicationsAPIKind: ""
 
   # Described in detail here https://argocd-image-updater.readthedocs.io/en/stable/install/running/#flags
+  # Note: this is only relevant if config.applicationsAPIKind == 'argocd'
   argocd:
     # -- Use the gRPC-web protocol to connect to the Argo CD API
     grpcWeb: true