From 258c88f2f74e3fa213bc1abac52434a0c34ad996 Mon Sep 17 00:00:00 2001 From: Erich Blume Date: Mon, 19 Jan 2026 15:00:33 -0800 Subject: [PATCH] Fix kustomize patch: remove namespace for proper matching Kustomize matches patches before namespace transformation, so the patch file shouldn't specify namespace (kustomization.yaml adds it). Co-Authored-By: Claude Opus 4.5 --- argocd/manifests/argocd/argocd-ssh-known-hosts-cm.yaml | 1 - argocd/manifests/argocd/kustomization.yaml | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/argocd/manifests/argocd/argocd-ssh-known-hosts-cm.yaml b/argocd/manifests/argocd/argocd-ssh-known-hosts-cm.yaml index 8d6c802..61525aa 100644 --- a/argocd/manifests/argocd/argocd-ssh-known-hosts-cm.yaml +++ b/argocd/manifests/argocd/argocd-ssh-known-hosts-cm.yaml @@ -4,7 +4,6 @@ apiVersion: v1 kind: ConfigMap metadata: name: argocd-ssh-known-hosts-cm - namespace: argocd data: ssh_known_hosts: | # Upstream ArgoCD defaults diff --git a/argocd/manifests/argocd/kustomization.yaml b/argocd/manifests/argocd/kustomization.yaml index a7d66b5..807d37e 100644 --- a/argocd/manifests/argocd/kustomization.yaml +++ b/argocd/manifests/argocd/kustomization.yaml @@ -6,7 +6,7 @@ namespace: argocd resources: - https://raw.githubusercontent.com/argoproj/argo-cd/stable/manifests/install.yaml - service-tailscale.yaml - - argocd-ssh-known-hosts-cm.yaml -patchesStrategicMerge: - - argocd-cmd-params-cm.yaml +patches: + - path: argocd-cmd-params-cm.yaml + - path: argocd-ssh-known-hosts-cm.yaml