Use either hostname or etcd.extraArgs.name for EtcdMember object name

Signed-off-by: Jussi Nummelin <[email protected]>

pkg/apis/k0s/v1beta1/storage.go

@@ -20,6 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"net/url"
+	"os"
 	"path/filepath"
 	"strings"
 
@@ -161,6 +162,17 @@ func DefaultEtcdConfig() *EtcdConfig {
 	}
 }
 
+const etcdNameExtraArg = "name"
+
+// GetNodeName returns the node name for the etcd peer
+func (e *EtcdConfig) GetNodeName() (string, error) {
+	if e.ExtraArgs != nil && e.ExtraArgs[etcdNameExtraArg] != "" {
+		return e.ExtraArgs[etcdNameExtraArg], nil
+	}
+
+	return os.Hostname()
+}
+
 // DefaultKineConfig creates KineConfig with sane defaults
 func DefaultKineConfig(dataDir string) *KineConfig {
 	// https://www.sqlite.org/c3ref/open.html#urifilenamesinsqlite3open

pkg/apis/k0s/v1beta1/storage_test.go

@@ -18,10 +18,12 @@ package v1beta1
 
 import (
 	"fmt"
+	"os"
 	"runtime"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )
 
@@ -329,3 +331,39 @@ func TestStorageSuite(t *testing.T) {
 
 	suite.Run(t, storageSuite)
 }
+
+func TestEtcdConfig_GetNodeName(t *testing.T) {
+	require := require.New(t)
+
+	hostname, err := os.Hostname()
+	require.NoError(err)
+
+	tests := []struct {
+		name string
+		e    *EtcdConfig
+		want string
+	}{
+		{
+			name: "no extra args - default to hostname",
+			e:    &EtcdConfig{},
+			want: hostname,
+		},
+		{
+			name: "node name set in extra args",
+			e: &EtcdConfig{
+				ExtraArgs: map[string]string{
+					"name": "node-1",
+				},
+			},
+			want: "node-1",
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, _ := tt.e.GetNodeName()
+			if got != tt.want {
+				t.Errorf("EtcdConfig.GetNodeName() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}

pkg/component/controller/etcd_member_reconciler.go

@@ -20,7 +20,6 @@ import (
 	"context"
 	"fmt"
 	"net"
-	"os"
 	"strconv"
 	"time"
 
@@ -176,8 +175,8 @@ func (e *EtcdMemberReconciler) createMemberObject(ctx context.Context) error {
 
 	// Convert the memberID to hex string
 	memberIDStr := fmt.Sprintf("%x", memberID)
+	name, err := e.etcdConfig.GetNodeName()
 
-	name, err := os.Hostname()
 	if err != nil {
 		return err
 	}