rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-07-14 07:36:05 +00:00
Code Issues Releases Wiki Activity

Fix etcd client endpoint address

Browse Source
This commit is contained in:
moelsayed 2018-04-20 22:17:45 +02:00 committed by Darren Shepherd
parent fb1fd833ce
commit 0069872976
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/plan.go
View File

@ -578,9 +578,8 @@ func (c *Cluster) BuildEtcdProcess(host *hosts.Host, etcdHosts []*hosts.Host, pr
} }
Binds = append(Binds, c.Services.Etcd.ExtraBinds...) Binds = append(Binds, c.Services.Etcd.ExtraBinds...)
healthCheck := v3.HealthCheck{ healthCheck := v3.HealthCheck{
URL: services.EtcdHealthCheckURL, URL: fmt.Sprintf("https://%s:2379/health", host.InternalAddress),
} }
registryAuthConfig, _, _ := docker.GetImageRegistryConfig(c.Services.Etcd.Image, c.PrivateRegistriesMap) registryAuthConfig, _, _ := docker.GetImageRegistryConfig(c.Services.Etcd.Image, c.PrivateRegistriesMap)

4
services/etcd.go
View File

@ -16,10 +16,6 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
) )
const (
EtcdHealthCheckURL = "https://127.0.0.1:2379/health"
)
func RunEtcdPlane(ctx context.Context, etcdHosts []*hosts.Host, etcdNodePlanMap map[string]v3.RKEConfigNodePlan, localConnDialerFactory hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, updateWorkersOnly bool, alpineImage string) error { func RunEtcdPlane(ctx context.Context, etcdHosts []*hosts.Host, etcdNodePlanMap map[string]v3.RKEConfigNodePlan, localConnDialerFactory hosts.DialerFactory, prsMap map[string]v3.PrivateRegistry, updateWorkersOnly bool, alpineImage string) error {
log.Infof(ctx, "[%s] Building up etcd plane..", ETCDRole) log.Infof(ctx, "[%s] Building up etcd plane..", ETCDRole)
for _, host := range etcdHosts { for _, host := range etcdHosts {

2
services/etcd_util.go
View File

@ -32,7 +32,7 @@ func getEtcdClient(ctx context.Context, etcdHost *hosts.Host, localConnDialerFac
} }
cfg := etcdclient.Config{ cfg := etcdclient.Config{
Endpoints: []string{"https://127.0.0.1:2379"}, Endpoints: []string{"https://" + etcdHost.InternalAddress + ":2379"},
Transport: DefaultEtcdTransport, Transport: DefaultEtcdTransport,
} }