Merge branch 'main' into prod

Configure for cascade while fixing merge conflict

argo1/templates/cluster-resources.yaml

@@ -0,0 +1,33 @@
+# {{ if (index .Values "cluster-resources").enabled }}
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: {{ .Release.Name }}-cluster-resources
+  namespace: argocd
+  finalizers:
+  - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+  source:
+    path: {{ (index .Values "cluster-resources").path | default "." | quote }}
+    repoURL: {{ (index .Values "cluster-resources").repoURL | quote }}
+    targetRevision: {{ (index .Values "cluster-resources").targetRevision | default "main" | quote}}
+    directory:
+      recurse: {{ (index .Values "cluster-resources").directory.recurse | default "true" }}
+      include: {{ (index .Values "cluster-resources").directory.include | default "*.yaml" | quote }}
+  destination:
+    server: "https://kubernetes.default.svc"
+    namespace: argocd
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+    retry:
+      limit: 10
+      backoff:
+        duration: 5s
+        factor: 2
+        maxDuration: 3m0s
+# {{- end }}

argo1/values.yaml

@@ -69,6 +69,10 @@ argo-cd:
       - hosts: *ghosts
         secretName: wildcard-tls
 
+cluster-resources:
+  enabled: true
+  repoURL: 'https://git.strudelline.net/infra/kube-cascade'
+
 vault-agent-injector:
   enabled: true
   values: |