From 81c42f67e97cbffe70bf035bead22b5535ae348a Mon Sep 17 00:00:00 2001
From: Mayne0213 <bluemayne0213@icloud.com>
Date: Sat, 10 Jan 2026 19:44:02 +0900
Subject: [PATCH] REFACTOR(argocd): merge image-updater into argocd

- Move image-updater Application to argocd folder
- Move helm-values and secrets to argocd
- Remove separate argocd-image-updater folder
- Update kustomization references
---
 argocd-image-updater/kustomization.yaml                     | 6 ------
 .../helm-values.yaml => argocd/image-updater-values.yaml    | 0
 .../argocd.yaml => argocd/image-updater.yaml                | 5 +----
 argocd/kustomization.yaml                                   | 3 +++
 .../manifests/image-updater-secret.yaml                     | 0
 kustomization.yaml                                          | 2 +-
 6 files changed, 5 insertions(+), 11 deletions(-)
 delete mode 100644 argocd-image-updater/kustomization.yaml
 rename argocd-image-updater/helm-values.yaml => argocd/image-updater-values.yaml (100%)
 rename argocd-image-updater/argocd.yaml => argocd/image-updater.yaml (78%)
 rename argocd-image-updater/manifests/secret.yaml => argocd/manifests/image-updater-secret.yaml (100%)

diff --git a/argocd-image-updater/kustomization.yaml b/argocd-image-updater/kustomization.yaml
deleted file mode 100644
index 86a1e27..0000000
--- a/argocd-image-updater/kustomization.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-
-resources:
-  - argocd.yaml
-  - manifests/secret.yaml
diff --git a/argocd-image-updater/helm-values.yaml b/argocd/image-updater-values.yaml
similarity index 100%
rename from argocd-image-updater/helm-values.yaml
rename to argocd/image-updater-values.yaml
diff --git a/argocd-image-updater/argocd.yaml b/argocd/image-updater.yaml
similarity index 78%
rename from argocd-image-updater/argocd.yaml
rename to argocd/image-updater.yaml
index 37f0814..663b4e2 100644
--- a/argocd-image-updater/argocd.yaml
+++ b/argocd/image-updater.yaml
@@ -11,13 +11,10 @@ spec:
       targetRevision: 0.11.0
       helm:
         valueFiles:
-          - $values/argocd-image-updater/helm-values.yaml
+          - $values/argocd/image-updater-values.yaml
     - repoURL: https://github.com/K3S-HOME/platform.git
       targetRevision: main
       ref: values
-    - repoURL: https://github.com/K3S-HOME/platform.git
-      targetRevision: main
-      path: argocd-image-updater/manifests
   destination:
     server: https://kubernetes.default.svc
     namespace: argocd
diff --git a/argocd/kustomization.yaml b/argocd/kustomization.yaml
index 9097c21..3a781c8 100644
--- a/argocd/kustomization.yaml
+++ b/argocd/kustomization.yaml
@@ -3,6 +3,9 @@ kind: Kustomization
 resources:
   # ArgoCD Application (self-managed via Helm chart)
   - argocd.yaml
+  # ArgoCD Image Updater Application
+  - image-updater.yaml
   # Additional manifests (applied alongside Helm chart)
   - manifests/namespace.yaml
   - manifests/webhook-ingress.yaml
+  - manifests/image-updater-secret.yaml
diff --git a/argocd-image-updater/manifests/secret.yaml b/argocd/manifests/image-updater-secret.yaml
similarity index 100%
rename from argocd-image-updater/manifests/secret.yaml
rename to argocd/manifests/image-updater-secret.yaml
diff --git a/kustomization.yaml b/kustomization.yaml
index d9c28fb..847a8b5 100644
--- a/kustomization.yaml
+++ b/kustomization.yaml
@@ -9,6 +9,6 @@ resources:
   - priority-classes/argocd.yaml
   - cert-manager/argocd.yaml
   - traefik/argocd.yaml
-  - argocd-image-updater/argocd.yaml
   - argocd/argocd.yaml
+  - argocd/image-updater.yaml
   - gitea/argocd.yaml