Add machine names as etcd name

Signed-off-by: Adrian Pedriza <adripedriza@gmail.com>

internal/controller/bootstrap/controlplane_bootstrap_controller.go

@@ -154,6 +154,18 @@ func (c *ControlPlaneController) Reconcile(ctx context.Context, req ctrl.Request
 	)
 
 	if config.Spec.K0s != nil {
+		storage, found, err := unstructured.NestedMap(config.Spec.K0s.Object, "spec", "storage", "etcd")
+		if err != nil {
+			return ctrl.Result{}, fmt.Errorf("error retrieving storage.etcd: %w", err)
+
+		}
+		if found && storage != nil {
+			err = unstructured.SetNestedField(config.Spec.K0s.Object, machine.Name, "spec", "storage", "etcd", "extraArgs", "name")
+			if err != nil {
+				return ctrl.Result{}, fmt.Errorf("error setting storage.etcd.extraArgs.name: %w", err)
+			}
+		}
+
 		nllbEnabled, found, err := unstructured.NestedBool(config.Spec.K0s.Object, "spec", "network", "nodeLocalLoadBalancing", "enabled")
 		if err != nil {
 			return ctrl.Result{}, fmt.Errorf("error getting nodeLocalLoadBalancing: %v", err)

internal/controller/controlplane/k0s_controlplane_controller.go

@@ -20,6 +20,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"strings"
+
 	"github.com/Masterminds/semver"
 	"github.com/google/uuid"
 	autopilot "github.com/k0sproject/k0s/pkg/apis/autopilot/v1beta2"
@@ -43,7 +45,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
-	"strings"
 
 	bootstrapv1 "github.com/k0sproject/k0smotron/api/bootstrap/v1beta1"
 	cpv1beta1 "github.com/k0sproject/k0smotron/api/controlplane/v1beta1"

internal/controller/controlplane/util.go

@@ -3,6 +3,7 @@ package controlplane
 import (
 	"context"
 	"fmt"
+
 	"github.com/imdario/mergo"
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"