Merge pull request k0sproject#5181 from ncopa/ipv6-etcd-peer

Fix etcd peer URL to support ipv6
CindyLizi · Nov 8, 2024 · 09ac812 · 09ac812
2 parents 994f4cc + 1469e0c
commit 09ac812
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/pkg/apis/k0s/v1beta1/storage.go b/pkg/apis/k0s/v1beta1/storage.go
@@ -19,6 +19,7 @@ package v1beta1
 import (
 	"encoding/json"
 	"fmt"
+	"net"
 	"net/url"
 	"os"
 	"path/filepath"
@@ -179,6 +180,15 @@ func (e *EtcdConfig) GetNodeName() (string, error) {
 	return os.Hostname()
 }
 
+// GetPeerURL returns the URL of PeerAddress
+func (e *EtcdConfig) GetPeerURL() string {
+	u := &url.URL{
+		Scheme: "https",
+		Host:   net.JoinHostPort(e.PeerAddress, "2380"),
+	}
+	return u.String()
+}
+
 // DefaultKineConfig creates KineConfig with sane defaults
 func DefaultKineConfig(dataDir string) *KineConfig {
 	return &KineConfig{

diff --git a/pkg/backup/etcd_unix.go b/pkg/backup/etcd_unix.go
@@ -21,6 +21,8 @@ package backup
 import (
 	"context"
 	"fmt"
+	"net"
+	"net/url"
 	"os"
 	"path/filepath"
 
@@ -84,7 +86,11 @@ func (e etcdStep) Restore(restoreFrom, _ string) error {
 	if err != nil {
 		return err
 	}
-	peerURL := fmt.Sprintf("https://%s:2380", e.peerAddress)
+	u := &url.URL{
+		Scheme: "https",
+		Host:   net.JoinHostPort(e.peerAddress, "2380"),
+	}
+	peerURL := u.String()
 	restoreConfig := utilsnapshot.RestoreConfig{
 		SnapshotPath:   snapshotPath,
 		OutputDataDir:  e.etcdDataDir,

diff --git a/pkg/component/controller/etcd.go b/pkg/component/controller/etcd.go
@@ -169,7 +169,7 @@ func (e *Etcd) Start(ctx context.Context) error {
 		name = hostName
 	}
 
-	peerURL := fmt.Sprintf("https://%s:2380", e.Config.PeerAddress)
+	peerURL := e.Config.GetPeerURL()
 
 	args := stringmap.StringMap{
 		"--data-dir":                    e.K0sVars.EtcdDataDir,

diff --git a/pkg/component/controller/etcd_member_reconciler.go b/pkg/component/controller/etcd_member_reconciler.go
@@ -20,7 +20,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"net"
 	"strconv"
 	"time"
 
@@ -177,9 +176,7 @@ func (e *EtcdMemberReconciler) createMemberObject(ctx context.Context) error {
 		return err
 	}
 
-	peerURL := fmt.Sprintf("https://%s", net.JoinHostPort(e.etcdConfig.PeerAddress, "2380"))
-
-	memberID, err := etcdClient.GetPeerIDByAddress(ctx, peerURL)
+	memberID, err := etcdClient.GetPeerIDByAddress(ctx, e.etcdConfig.GetPeerURL())
 	if err != nil {
 		return err
 	}