fix DNSServiceConfig being cluster-scoped

Author: Diaphteiros

cmd/platform-service-dns/app/run.go

@@ -239,12 +239,11 @@ func (o *RunOptions) Run(ctx context.Context) error {
 	// This also happens in the reconcile, but then the pod will look healthy while it is actually not able to reconcile anything.
 	svcCfg := &dnsv1alpha1.DNSServiceConfig{}
 	svcCfg.Name = o.ProviderName
-	svcCfg.Namespace = o.ProviderNamespace
 	if err := o.PlatformCluster.Client().Get(ctx, client.ObjectKeyFromObject(svcCfg), svcCfg); err != nil {
 		if apierrors.IsNotFound(err) {
-			return fmt.Errorf("DNSServiceConfig '%s/%s' not found: %w", svcCfg.Namespace, svcCfg.Name, err)
+			return fmt.Errorf("DNSServiceConfig '%s' not found: %w", svcCfg.Name, err)
 		}
-		return fmt.Errorf("error getting DNSServiceConfig '%s/%s': %w", svcCfg.Namespace, svcCfg.Name, err)
+		return fmt.Errorf("error getting DNSServiceConfig '%s': %w", svcCfg.Name, err)
 	}
 	if err := cluster.NewClusterReconciler(o.PlatformCluster, mgr.GetEventRecorderFor(cluster.ControllerName), o.ProviderName, o.ProviderNamespace).SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("unable to add Cluster reconciler to manager: %w", err)

internal/controllers/cluster/controller.go

@@ -153,12 +153,11 @@ func (r *ClusterReconciler) reconcile(ctx context.Context, c *clustersv1alpha1.C
 	// load DNSServiceConfig resource
 	rr.ProviderConfig = &dnsv1alpha1.DNSServiceConfig{}
 	rr.ProviderConfig.Name = r.ProviderName
-	rr.ProviderConfig.Namespace = r.ProviderNamespace
 	if err := r.PlatformCluster.Client().Get(ctx, client.ObjectKeyFromObject(rr.ProviderConfig), rr.ProviderConfig); err != nil {
 		if apierrors.IsNotFound(err) {
-			rr.ReconcileError = errutils.WithReason(fmt.Errorf("DNSServiceConfig '%s/%s' not found", rr.ProviderConfig.Namespace, rr.ProviderConfig.Name), clusterconst.ReasonConfigurationProblem)
+			rr.ReconcileError = errutils.WithReason(fmt.Errorf("DNSServiceConfig '%s' not found", rr.ProviderConfig.Name), clusterconst.ReasonConfigurationProblem)
 		} else {
-			rr.ReconcileError = errutils.WithReason(fmt.Errorf("error getting DNSServiceConfig '%s/%s': %w", rr.ProviderConfig.Namespace, rr.ProviderConfig.Name, err), clusterconst.ReasonPlatformClusterInteractionProblem)
+			rr.ReconcileError = errutils.WithReason(fmt.Errorf("error getting DNSServiceConfig '%s': %w", rr.ProviderConfig.Name, err), clusterconst.ReasonPlatformClusterInteractionProblem)
 		}
 		return rr
 	}
@@ -773,7 +772,7 @@ func (r *ClusterReconciler) SetupWithManager(mgr ctrl.Manager) error {
 			})
 		}), builder.WithPredicates(predicate.And(
 			predicate.GenerationChangedPredicate{},
-			ctrlutils.ExactNamePredicate(r.ProviderName, r.ProviderNamespace),
+			ctrlutils.ExactNamePredicate(r.ProviderName, ""),
 		))).
 		Complete(r)
 }

internal/controllers/cluster/controller_test.go

@@ -65,7 +65,7 @@ var _ = Describe("ClusterReconciler", func() {
 		env := defaultTestSetup("testdata", "test-01")
 
 		// delete any existing DNSServiceConfig
-		Expect(env.Client().DeleteAllOf(env.Ctx, &dnsv1alpha1.DNSServiceConfig{}, client.InNamespace(providerNamespace))).To(Succeed())
+		Expect(env.Client().DeleteAllOf(env.Ctx, &dnsv1alpha1.DNSServiceConfig{})).To(Succeed())
 
 		c := &clustersv1alpha1.Cluster{}
 		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: "cluster-01", Namespace: "foo"}, c)).To(Succeed())
@@ -76,7 +76,7 @@ var _ = Describe("ClusterReconciler", func() {
 		env := defaultTestSetup("testdata", "test-01")
 
 		cfg := &dnsv1alpha1.DNSServiceConfig{}
-		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName, Namespace: providerNamespace}, cfg)).To(Succeed())
+		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName}, cfg)).To(Succeed())
 
 		c1 := &clustersv1alpha1.Cluster{}
 		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: "cluster-01", Namespace: "foo"}, c1)).To(Succeed())
@@ -210,7 +210,7 @@ var _ = Describe("ClusterReconciler", func() {
 		env := defaultTestSetup("testdata", "test-02")
 
 		cfg := &dnsv1alpha1.DNSServiceConfig{}
-		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName, Namespace: providerNamespace}, cfg)).To(Succeed())
+		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName}, cfg)).To(Succeed())
 
 		c1 := &clustersv1alpha1.Cluster{}
 		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: "cluster-01", Namespace: "foo"}, c1)).To(Succeed())
@@ -275,7 +275,7 @@ var _ = Describe("ClusterReconciler", func() {
 		env := defaultTestSetup("testdata", "test-01")
 
 		cfg := &dnsv1alpha1.DNSServiceConfig{}
-		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName, Namespace: providerNamespace}, cfg)).To(Succeed())
+		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName}, cfg)).To(Succeed())
 
 		c1 := &clustersv1alpha1.Cluster{}
 		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: "cluster-01", Namespace: "foo"}, c1)).To(Succeed())
@@ -345,7 +345,7 @@ var _ = Describe("ClusterReconciler", func() {
 		env := defaultTestSetup("testdata", "test-01")
 
 		cfg := &dnsv1alpha1.DNSServiceConfig{}
-		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName, Namespace: providerNamespace}, cfg)).To(Succeed())
+		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName}, cfg)).To(Succeed())
 
 		// create dummy flux sources
 		expectedLabels := map[string]string{
@@ -389,7 +389,7 @@ var _ = Describe("ClusterReconciler", func() {
 		env := defaultTestSetup("testdata", "test-03")
 
 		cfg := &dnsv1alpha1.DNSServiceConfig{}
-		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName, Namespace: providerNamespace}, cfg)).To(Succeed())
+		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName}, cfg)).To(Succeed())
 
 		c1 := &clustersv1alpha1.Cluster{}
 		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: "cluster-01", Namespace: "foo"}, c1)).To(Succeed())
@@ -422,7 +422,7 @@ var _ = Describe("ClusterReconciler", func() {
 		env := defaultTestSetup("testdata", "test-04")
 
 		cfg := &dnsv1alpha1.DNSServiceConfig{}
-		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName, Namespace: providerNamespace}, cfg)).To(Succeed())
+		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: providerName}, cfg)).To(Succeed())
 
 		c1 := &clustersv1alpha1.Cluster{}
 		Expect(env.Client().Get(env.Ctx, client.ObjectKey{Name: "cluster-01", Namespace: "foo"}, c1)).To(Succeed())

internal/controllers/cluster/testdata/test-01/config.yaml

@@ -2,7 +2,6 @@ apiVersion: dns.openmcp.cloud/v1alpha1
 kind: DNSServiceConfig
 metadata:
   name: dns-service
-  namespace: test
 spec:
   externalDNSSource:
     oci:

internal/controllers/cluster/testdata/test-02/config.yaml

@@ -2,7 +2,6 @@ apiVersion: dns.openmcp.cloud/v1alpha1
 kind: DNSServiceConfig
 metadata:
   name: dns-service
-  namespace: test
 spec:
   externalDNSSource:
     oci:

internal/controllers/cluster/testdata/test-03/config.yaml

@@ -2,7 +2,6 @@ apiVersion: dns.openmcp.cloud/v1alpha1
 kind: DNSServiceConfig
 metadata:
   name: dns-service
-  namespace: test
 spec:
   externalDNSSource:
     git:

internal/controllers/cluster/testdata/test-04/config.yaml

@@ -2,7 +2,6 @@ apiVersion: dns.openmcp.cloud/v1alpha1
 kind: DNSServiceConfig
 metadata:
   name: dns-service
-  namespace: test
 spec:
   externalDNSSource:
     helm: