Allow cross-namespace template instances

Signed-off-by: Danil-Grigorev <[email protected]>

controlplane/kubeadm/internal/webhooks/kubeadm_control_plane.go

@@ -376,16 +376,6 @@ func validateKubeadmControlPlaneSpec(s controlplanev1.KubeadmControlPlaneSpec, n
 			),
 		)
 	}
-	if s.MachineTemplate.InfrastructureRef.Namespace != namespace {
-		allErrs = append(
-			allErrs,
-			field.Invalid(
-				pathPrefix.Child("machineTemplate", "infrastructure", "namespace"),
-				s.MachineTemplate.InfrastructureRef.Namespace,
-				"must match metadata.namespace",
-			),
-		)
-	}
 
 	// Validate the metadata of the MachineTemplate
 	allErrs = append(allErrs, s.MachineTemplate.ObjectMeta.Validate(pathPrefix.Child("machineTemplate", "metadata"))...)

controlplane/kubeadm/internal/webhooks/kubeadm_control_plane_test.go

@@ -36,8 +36,7 @@ import (
 )
 
 var (
-	invalidNamespaceName = "bar"
-	ctx                  = ctrl.SetupSignalHandler()
+	ctx = ctrl.SetupSignalHandler()
 )
 
 func TestKubeadmControlPlaneDefault(t *testing.T) {
@@ -116,9 +115,6 @@ func TestKubeadmControlPlaneValidateCreate(t *testing.T) {
 	val := intstr.FromString("1")
 	stringMaxSurge.Spec.RolloutStrategy.RollingUpdate.MaxSurge = &val
 
-	invalidNamespace := valid.DeepCopy()
-	invalidNamespace.Spec.MachineTemplate.InfrastructureRef.Namespace = invalidNamespaceName
-
 	missingReplicas := valid.DeepCopy()
 	missingReplicas.Spec.Replicas = nil
 
@@ -182,11 +178,6 @@ func TestKubeadmControlPlaneValidateCreate(t *testing.T) {
 			expectErr: false,
 			kcp:       valid,
 		},
-		{
-			name:      "should return error when kubeadmControlPlane namespace and infrastructureTemplate  namespace mismatch",
-			expectErr: true,
-			kcp:       invalidNamespace,
-		},
 		{
 			name:      "should return error when replicas is nil",
 			expectErr: true,
@@ -446,9 +437,6 @@ func TestKubeadmControlPlaneValidateUpdate(t *testing.T) {
 	scaleToEven := before.DeepCopy()
 	scaleToEven.Spec.Replicas = ptr.To[int32](2)
 
-	invalidNamespace := before.DeepCopy()
-	invalidNamespace.Spec.MachineTemplate.InfrastructureRef.Namespace = invalidNamespaceName
-
 	missingReplicas := before.DeepCopy()
 	missingReplicas.Spec.Replicas = nil
 
@@ -765,12 +753,6 @@ func TestKubeadmControlPlaneValidateUpdate(t *testing.T) {
 			before:    before,
 			kcp:       scaleToEven,
 		},
-		{
-			name:      "should return error when trying to reference cross namespace",
-			expectErr: true,
-			before:    before,
-			kcp:       invalidNamespace,
-		},
 		{
 			name:      "should return error when trying to scale to nil",
 			expectErr: true,

exp/topology/desiredstate/desired_state.go

@@ -1347,6 +1347,7 @@ func templateToTemplate(in templateToInput) (*unstructured.Unstructured, error)
 	if in.currentObjectRef != nil && in.currentObjectRef.Name != "" {
 		template.SetName(in.currentObjectRef.Name)
 	}
+	template.SetNamespace(in.cluster.Namespace)
 
 	return template, nil
 }