From 12995c3819cc11607687c7110b585a5855feaecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rcio=20Fernandes?= <marcio.fernandes@outlook.pt>
Date: Sat, 26 Sep 2026 23:53:04 +0000
Subject: [PATCH] fix: flux manifests

---
 deploy/flux/icarus-mngt/fluxcd-kustomization.yaml        | 2 +-
 deploy/flux/icarus-mngt/kustomization.yaml               | 1 +
 .../fluxcd-kustomization.yaml                            | 2 ++
 .../kustomization.yaml                                   | 1 +
 deploy/flux/{ => repo}/.env.d/.gitignore                 | 0
 deploy/flux/{ => repo}/git-repo.yaml                     | 2 +-
 deploy/flux/{ => repo}/kustomization.yaml                | 9 ++++-----
 7 files changed, 10 insertions(+), 7 deletions(-)
 rename deploy/flux/{ => repo}/.env.d/.gitignore (100%)
 rename deploy/flux/{ => repo}/git-repo.yaml (84%)
 rename deploy/flux/{ => repo}/kustomization.yaml (65%)

diff --git a/deploy/flux/icarus-mngt/fluxcd-kustomization.yaml b/deploy/flux/icarus-mngt/fluxcd-kustomization.yaml
index 105af6c..e744366 100644
--- a/deploy/flux/icarus-mngt/fluxcd-kustomization.yaml
+++ b/deploy/flux/icarus-mngt/fluxcd-kustomization.yaml
@@ -6,7 +6,7 @@ spec:
   interval: 1m
   sourceRef:
     kind: GitRepository
-    name: myinfra-kubernetes-shared
+    name: nodes-mngt
     namespace: chimera-limbosolutions-com
   path: deploy/icarus-mngt
   prune: true
diff --git a/deploy/flux/icarus-mngt/kustomization.yaml b/deploy/flux/icarus-mngt/kustomization.yaml
index cd0997c..308f4af 100644
--- a/deploy/flux/icarus-mngt/kustomization.yaml
+++ b/deploy/flux/icarus-mngt/kustomization.yaml
@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: icarus-nodes-mngt
 resources:
   - fluxcd-kustomization.yaml
   - secrets
diff --git a/deploy/flux/mylimbo-ansible-collections-global/fluxcd-kustomization.yaml b/deploy/flux/mylimbo-ansible-collections-global/fluxcd-kustomization.yaml
index 534c8fe..9b5cff7 100644
--- a/deploy/flux/mylimbo-ansible-collections-global/fluxcd-kustomization.yaml
+++ b/deploy/flux/mylimbo-ansible-collections-global/fluxcd-kustomization.yaml
@@ -2,6 +2,7 @@ apiVersion: kustomize.toolkit.fluxcd.io/v1
 kind: Kustomization
 metadata:
   name: mylimbo-ansible-collections-global
+  namespace: icarus-nodes-mngt
 spec:
   interval: 1m
   sourceRef:
@@ -10,3 +11,4 @@ spec:
     namespace: chimera-limbosolutions-com
   path: mylimbo-ansible-collections-global
   prune: true
+  targetNamespace: icarus-nodes-mngt
diff --git a/deploy/flux/mylimbo-ansible-collections-global/kustomization.yaml b/deploy/flux/mylimbo-ansible-collections-global/kustomization.yaml
index 33ec423..3694f01 100644
--- a/deploy/flux/mylimbo-ansible-collections-global/kustomization.yaml
+++ b/deploy/flux/mylimbo-ansible-collections-global/kustomization.yaml
@@ -1,5 +1,6 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: icarus-nodes-mngt
 resources:
   - fluxcd-kustomization.yaml
 
diff --git a/deploy/flux/.env.d/.gitignore b/deploy/flux/repo/.env.d/.gitignore
similarity index 100%
rename from deploy/flux/.env.d/.gitignore
rename to deploy/flux/repo/.env.d/.gitignore
diff --git a/deploy/flux/git-repo.yaml b/deploy/flux/repo/git-repo.yaml
similarity index 84%
rename from deploy/flux/git-repo.yaml
rename to deploy/flux/repo/git-repo.yaml
index bf8f251..395e321 100644
--- a/deploy/flux/git-repo.yaml
+++ b/deploy/flux/repo/git-repo.yaml
@@ -8,4 +8,4 @@ spec:
   ref:
     branch: main
   secretRef:
-    name: flux-repo-ssh-credentials
\ No newline at end of file
+    name: nodes-mngt-repo-ssh-credentials
\ No newline at end of file
diff --git a/deploy/flux/kustomization.yaml b/deploy/flux/repo/kustomization.yaml
similarity index 65%
rename from deploy/flux/kustomization.yaml
rename to deploy/flux/repo/kustomization.yaml
index 22c1ed0..65e04c7 100644
--- a/deploy/flux/kustomization.yaml
+++ b/deploy/flux/repo/kustomization.yaml
@@ -1,16 +1,15 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
-namespace: icarus-nodes-mngt
+namespace: chimera-limbosolutions-com
 resources:
   - git-repo.yaml
-  - mylimbo-ansible-collections-global
-#  - icarus-mngt
 secretGenerator:
-  - name: flux-repo-ssh-credentials
+  - name: nodes-mngt-repo-ssh-credentials
     files:
       - "identity=./.env.d/flux-repo-ssh-key"
       - "known_hosts=./.env.d/flux-repo-ssh-known_hosts"
       - "pubkey=./.env.d/flux-repo-ssh-key.pub"
-  - name: flux-sops-age
+generatorOptions:
+  disableNameSuffixHash: true