Double-check and populate ns for MS and MD template

Signed-off-by: Danil-Grigorev <[email protected]>
kubernetes-sigs · Nov 18, 2024 · de51a24 · de51a24
1 parent a3e3e9a
commit de51a24
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/internal/controllers/machinedeployment/machinedeployment_controller.go b/internal/controllers/machinedeployment/machinedeployment_controller.go
@@ -513,6 +513,12 @@ func reconcileExternalTemplateReference(ctx context.Context, c client.Client, cl
 		return errors.New(err.Error())
 	}
 
+	// Ensure the ref namespace is populated for objects not yet defaulted by webhook
+	if ref.Namespace == "" {
+		ref = ref.DeepCopy()
+		ref.Namespace = cluster.Namespace
+	}
+
 	obj, err := external.Get(ctx, c, ref)
 	if err != nil {
 		return err

diff --git a/internal/controllers/machineset/machineset_controller.go b/internal/controllers/machineset/machineset_controller.go
@@ -1516,6 +1516,12 @@ func (r *Reconciler) reconcileExternalTemplateReference(ctx context.Context, clu
 		return false, err
 	}
 
+	// Ensure the ref namespace is populated for objects not yet defaulted by webhook
+	if ref.Namespace == "" {
+		ref = ref.DeepCopy()
+		ref.Namespace = cluster.Namespace
+	}
+
 	obj, err := external.Get(ctx, r.Client, ref)
 	if err != nil {
 		if apierrors.IsNotFound(err) {