From f1b73cffbab1c2f4e658c61561815075719c52c5 Mon Sep 17 00:00:00 2001
From: Daniel Cosme <cosmedaniel8@gmail.com>
Date: Thu, 30 Apr 2026 14:35:35 -0400
Subject: [PATCH] Add namespace to Cluster

---
 apps/hydra/linkding/kuztomization.yaml               | 4 ++--
 go.mod                                               | 2 +-
 go.sum                                               | 4 ++--
 infrastructure/hydra/cloud-native-pg/pg-cluster.yaml | 1 +
 infrastructure/hydra/truenas-csi/kuztomization.yaml  | 8 ++++----
 pkg/cnpg/cnpg.go                                     | 4 +++-
 pkg/cnpg/helm.go                                     | 8 ++------
 7 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/apps/hydra/linkding/kuztomization.yaml b/apps/hydra/linkding/kuztomization.yaml
index f79e113..c922b44 100644
--- a/apps/hydra/linkding/kuztomization.yaml
+++ b/apps/hydra/linkding/kuztomization.yaml
@@ -4,7 +4,7 @@ metadata:
   name: linking
   namespace: linkding
 resources:
-- pvc.yaml
-- deployment.yaml
 - namespace.yaml
 - srv.yaml
+- pvc.yaml
+- deployment.yaml
diff --git a/go.mod b/go.mod
index 7193a70..4343a2b 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module danicos.dev/daniel/homelab
 go 1.26.2
 
 require (
-	danicos.dev/daniel/go-kube v1.11.0
+	danicos.dev/daniel/go-kube v1.12.1
 	github.com/cloudnative-pg/api v1.29.0
 	github.com/fatih/color v1.19.0
 	github.com/fluxcd/helm-controller/api v1.5.4
diff --git a/go.sum b/go.sum
index fd15dbf..e46fc9a 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,5 @@
-danicos.dev/daniel/go-kube v1.11.0 h1:MGWB8bGOZuGv+HaRwTxWirngdtYerp+PpOk/YptRCqg=
-danicos.dev/daniel/go-kube v1.11.0/go.mod h1:zOhFK+bE4t14yOokp+yqh8Pht1/U102JV/29QoKBjjc=
+danicos.dev/daniel/go-kube v1.12.1 h1:JQBW2zgx1g2OwAuuSyEspAm709YLBSFZs8sWVv73sGs=
+danicos.dev/daniel/go-kube v1.12.1/go.mod h1:zOhFK+bE4t14yOokp+yqh8Pht1/U102JV/29QoKBjjc=
 github.com/Masterminds/semver/v3 v3.4.0 h1:Zog+i5UMtVoCU8oKka5P7i9q9HgrJeGzI9SA1Xbatp0=
 github.com/Masterminds/semver/v3 v3.4.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/cloudnative-pg/api v1.29.0 h1:mNx6yJ5qi+Xrjs0NYrUy6V4MlXBkVJxGKwvTJZIuTX4=
diff --git a/infrastructure/hydra/cloud-native-pg/pg-cluster.yaml b/infrastructure/hydra/cloud-native-pg/pg-cluster.yaml
index f157e1f..9a996fa 100644
--- a/infrastructure/hydra/cloud-native-pg/pg-cluster.yaml
+++ b/infrastructure/hydra/cloud-native-pg/pg-cluster.yaml
@@ -2,6 +2,7 @@ apiVersion: postgresql.cnpg.io/v1
 kind: Cluster
 metadata:
   name: cnpg-cluster
+  namespace: cnpg-cluster
 spec:
   affinity: {}
   instances: 3
diff --git a/infrastructure/hydra/truenas-csi/kuztomization.yaml b/infrastructure/hydra/truenas-csi/kuztomization.yaml
index ca7c74a..3d6f007 100644
--- a/infrastructure/hydra/truenas-csi/kuztomization.yaml
+++ b/infrastructure/hydra/truenas-csi/kuztomization.yaml
@@ -4,16 +4,16 @@ metadata:
   name: truenas-csi
   namespace: truenas-csi
 resources:
+- iscsi-storage-class.yaml
 - controller-service-account.yaml
 - controller-binding.yaml
+- node-service-account.yaml
 - node-cluster-role.yaml
+- node-binding.yaml
 - node-deamonset.yaml
-- CSIDriver.yaml
-- iscsi-storage-class.yaml
 - namespace.yaml
 - controller-deployment.yaml
 - controller-cluster-role.yaml
-- node-service-account.yaml
-- node-binding.yaml
+- CSIDriver.yaml
 - config.yaml
 - nfs-storage-class.yaml
diff --git a/pkg/cnpg/cnpg.go b/pkg/cnpg/cnpg.go
index c189704..55bfeb4 100644
--- a/pkg/cnpg/cnpg.go
+++ b/pkg/cnpg/cnpg.go
@@ -28,6 +28,8 @@ func Stack() stack.Stack {
 }
 
 func Cluster() pg.Cluster {
+	namespace := kube.Namespace(root.CloudNativePG + "-cluster")
+	meta = kube.NewMetadata(root.CloudNativePG+"-cluster", namespace)
 	spec := pg.ClusterSpec{
 		Instances: 3,
 		StorageConfiguration: pg.StorageConfiguration{
@@ -39,5 +41,5 @@ func Cluster() pg.Cluster {
 			},
 		},
 	}
-	return kube_cnpg.NewCluster(root.CloudNativePG+"-cluster", spec)
+	return kube_cnpg.NewCluster(meta, spec)
 }
diff --git a/pkg/cnpg/helm.go b/pkg/cnpg/helm.go
index 7ce30c1..dac8d8f 100644
--- a/pkg/cnpg/helm.go
+++ b/pkg/cnpg/helm.go
@@ -35,12 +35,8 @@ func HelmRelease() helm.HelmRelease {
 				},
 			},
 		},
-		Install: &helm.Install{
-			CRDs: helm.Create,
-		},
-		Upgrade: &helm.Upgrade{
-			CRDs: helm.CreateReplace,
-		},
+		Install: &helm.Install{CRDs: helm.Create},
+		Upgrade: &helm.Upgrade{CRDs: helm.CreateReplace},
 	}
 	return flux.NewFluxHelmRelease(meta, spec)
 }