From f3a27fd7f6a008640d232affd35715600b8e9992 Mon Sep 17 00:00:00 2001
From: Stefan Prodan <stefan.prodan@gmail.com>
Date: Sat, 22 Jun 2024 21:43:26 +0300
Subject: [PATCH] Fix default values for cluster settings

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
---
 api/v1/fluxinstance_types.go                     | 16 ++++++----------
 .../controller/fluxinstance_controller_test.go   |  8 ++++++++
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/api/v1/fluxinstance_types.go b/api/v1/fluxinstance_types.go
index a5c4dcd..8f52804 100644
--- a/api/v1/fluxinstance_types.go
+++ b/api/v1/fluxinstance_types.go
@@ -273,17 +273,13 @@ func (in *FluxInstance) GetComponents() []string {
 func (in *FluxInstance) GetCluster() Cluster {
 	cluster := in.Spec.Cluster
 	if cluster == nil {
-		cluster = &Cluster{}
-	}
-	if cluster.Domain == "" {
-		cluster.Domain = "cluster.local"
-	}
-	if cluster.NetworkPolicy {
-		cluster.NetworkPolicy = true
-	}
-	if cluster.Type == "" {
-		cluster.Type = "kubernetes"
+		return Cluster{
+			Type:          "kubernetes",
+			Domain:        "cluster.local",
+			NetworkPolicy: true,
+		}
 	}
+
 	return *cluster
 }
 
diff --git a/internal/controller/fluxinstance_controller_test.go b/internal/controller/fluxinstance_controller_test.go
index 44afb90..a88850a 100644
--- a/internal/controller/fluxinstance_controller_test.go
+++ b/internal/controller/fluxinstance_controller_test.go
@@ -94,6 +94,14 @@ func TestFluxInstanceReconciler_LifeCycle(t *testing.T) {
 			ID:      fmt.Sprintf("%s_notification-controller_apps_Deployment", ns.Name),
 			Version: "v1",
 		},
+		fluxcdv1.ResourceRef{
+			ID:      fmt.Sprintf("%s_allow-egress_networking.k8s.io_NetworkPolicy", ns.Name),
+			Version: "v1",
+		},
+		fluxcdv1.ResourceRef{
+			ID:      fmt.Sprintf("_cluster-reconciler-%s_rbac.authorization.k8s.io_ClusterRoleBinding", ns.Name),
+			Version: "v1",
+		},
 	))
 
 	// Check if components images were recorded.