Merge remote-tracking branches 'origin/refs/pull/397/head' and 'origin/refs/pull/398/head'

Author: daurnimator

argocd/kustomization.yaml

@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: argocd
 resources:
-  - github.com/argoproj/argo-cd/manifests/cluster-install?ref=34ccdfc3d5235b0184eb910b8ba4edcd81ef8f03 # tag=v3.3.4
+  - github.com/argoproj/argo-cd/manifests/cluster-install?ref=998fb59dc355653c0657908a6ea2f87136e022d1 # tag=v3.3.6
   - ingress.yaml
   - argo-cd-service-monitor.yaml
   - deploy-key.yaml
@@ -49,7 +49,7 @@ configMapGenerator:
       - gpg-keys/E6A270B1A4DA649A
 images:
   - name: quay.io/argoproj/argocd
-    newTag: v3.3.4@sha256:9f68a9a360ff65aaca66dfccf675219be73f0ac8c5c96797b6cb7760ee1b9056
+    newTag: v3.3.6@sha256:16b92ba472fbb9287459cc52e0ecff07288dff461209955098edb56ce866fe49
   - name: ghcr.io/dexidp/dex
     newTag: v2.43.1@sha256:0881d3c9359b436d585b2061736ce271c100331e073be9178ef405ce5bf09557
   - name: public.ecr.aws/docker/library/redis