rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-18 14:57:03 +00:00
Code Issues Releases Wiki Activity

Fix missing image for etcd only nodes

Browse Source
This commit is contained in:
Darren Shepherd 2018-04-14 10:18:51 -07:00
parent a4aa5c8192
commit 829afa1084
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/cluster.go
View File

@ -100,10 +100,10 @@ func (c *Cluster) DeployWorkerPlane(ctx context.Context) error {
// Deploy Worker plane // Deploy Worker plane
workerNodePlanMap := make(map[string]v3.RKEConfigNodePlan) workerNodePlanMap := make(map[string]v3.RKEConfigNodePlan)
// Build cp node plan map // Build cp node plan map
for _, workerHost := range c.ControlPlaneHosts { allHosts := hosts.GetUniqueHostList(c.EtcdHosts, c.ControlPlaneHosts, c.WorkerHosts)
for _, workerHost := range allHosts {
workerNodePlanMap[workerHost.Address] = BuildRKEConfigNodePlan(ctx, c, workerHost, workerHost.DockerInfo) workerNodePlanMap[workerHost.Address] = BuildRKEConfigNodePlan(ctx, c, workerHost, workerHost.DockerInfo)
} }
allHosts := hosts.GetUniqueHostList(c.EtcdHosts, c.ControlPlaneHosts, c.WorkerHosts)
if err := services.RunWorkerPlane(ctx, allHosts, if err := services.RunWorkerPlane(ctx, allHosts,
c.LocalConnDialerFactory, c.LocalConnDialerFactory,
c.PrivateRegistriesMap, c.PrivateRegistriesMap,

2
cluster/plan.go
View File

@ -48,7 +48,7 @@ func BuildRKEConfigNodePlan(ctx context.Context, myCluster *Cluster, host *hosts
portChecks = append(portChecks, BuildPortChecksFromPortList(host, WorkerPortList, ProtocolTCP)...) portChecks = append(portChecks, BuildPortChecksFromPortList(host, WorkerPortList, ProtocolTCP)...)
// Do we need an nginxProxy for this one ? // Do we need an nginxProxy for this one ?
if host.IsWorker && !host.IsControl { if !host.IsControl {
processes[services.NginxProxyContainerName] = myCluster.BuildProxyProcess() processes[services.NginxProxyContainerName] = myCluster.BuildProxyProcess()
} }
if host.IsControl { if host.IsControl {