github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed etcd URL in case of IPv6 address 

Signed-off-by: Roberto Bonafiglia <roberto.bonafiglia@suse.com>
pull/5385/head
Roberto Bonafiglia 2022-03-23 15:35:51 +01:00
parent 21fed356e6
commit 44253bcfd4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/etcd/etcd.go
View File

@ -45,6 +45,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
utilnet "k8s.io/apimachinery/pkg/util/net" utilnet "k8s.io/apimachinery/pkg/util/net"
"k8s.io/client-go/util/retry" "k8s.io/client-go/util/retry"
utilsnet "k8s.io/utils/net"
) )
const ( const (
@ -744,11 +745,17 @@ func (e *ETCD) migrateFromSQLite(ctx context.Context) error {
// peerURL returns the peer access address for the local node // peerURL returns the peer access address for the local node
func (e *ETCD) peerURL() string { func (e *ETCD) peerURL() string {
if utilsnet.IsIPv6String(e.address) {
return fmt.Sprintf("https://[%s]:2380", e.address)
}
return fmt.Sprintf("https://%s:2380", e.address) return fmt.Sprintf("https://%s:2380", e.address)
} }
// clientURL returns the client access address for the local node // clientURL returns the client access address for the local node
func (e *ETCD) clientURL() string { func (e *ETCD) clientURL() string {
if utilsnet.IsIPv6String(e.address) {
return fmt.Sprintf("https://[%s]:2379", e.address)
}
return fmt.Sprintf("https://%s:2379", e.address) return fmt.Sprintf("https://%s:2379", e.address)
} }
@ -756,7 +763,11 @@ func (e *ETCD) clientURL() string {
func (e *ETCD) metricsURL(expose bool) string { func (e *ETCD) metricsURL(expose bool) string {
address := "http://127.0.0.1:2381" address := "http://127.0.0.1:2381"
if expose { if expose {
address = fmt.Sprintf("http://%s:2381,%s", e.address, address) if utilsnet.IsIPv6String(e.address) {
address = fmt.Sprintf("https://[%s]:2381,%s", e.address, address)
} else {
address = fmt.Sprintf("https://%s:2381,%s", e.address, address)
}
} }
return address return address
} }