Merge remote-tracking branches 'origin/refs/pull/298/head' and 'origin/refs/pull/299/head'

Author: daurnimator

argocd/kustomization.yaml

@@ -49,7 +49,7 @@ configMapGenerator:
       - gpg-keys/E6A270B1A4DA649A
 images:
   - name: quay.io/argoproj/argocd
-    newTag: v2.12.1@sha256:a0ebfa7d419a1c78babc80fc77de093751d8a5fabffcaf3f7e81a4d55a23cc0d
+    newTag: v2.12.3@sha256:68894064bc381c19ea951029510aa614bd26bf46c2ec65ea445c7d8d095a9417
   - name: ghcr.io/dexidp/dex
     newTag: v2.38.0@sha256:b1d793440a98d7ecde7fa5dbc8cee1204ef0e8918d9e51ef6201f50d12d55925
   - name: redis