rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-04 08:24:28 +00:00
Code Issues Releases Wiki Activity

Merge pull request #62 from galal-hussein/fix_rolling_update

Browse Source 
Fix rolling update bug for multi master Nginx
This commit is contained in:
Hussein Galal
2017-11-29 00:37:39 +02:00
committed by GitHub
parent 5842cd8179 7af9ffbf9f
commit 5876560b9f
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cluster/state.go
View File

@@ -52,6 +52,9 @@ func (c *Cluster) GetClusterState() (*Cluster, error) {
if err != nil { if err != nil {
return nil, fmt.Errorf("Failed to Get Kubernetes certificates: %v", err) return nil, fmt.Errorf("Failed to Get Kubernetes certificates: %v", err)
} }
// setting cluster defaults for the fetched cluster as well
currentCluster.setClusterDefaults()
if err := currentCluster.InvertIndexHosts(); err != nil { if err := currentCluster.InvertIndexHosts(); err != nil {
return nil, fmt.Errorf("Failed to classify hosts from fetched cluster: %v", err) return nil, fmt.Errorf("Failed to classify hosts from fetched cluster: %v", err)
} }

4
services/proxy.go
View File

@@ -17,7 +17,9 @@ func RollingUpdateNginxProxy(cpHosts []hosts.Host, workerHosts []hosts.Host) err
nginxProxyEnv := buildProxyEnv(cpHosts) nginxProxyEnv := buildProxyEnv(cpHosts)
for _, host := range workerHosts { for _, host := range workerHosts {
imageCfg, hostCfg := buildNginxProxyConfig(host, nginxProxyEnv) imageCfg, hostCfg := buildNginxProxyConfig(host, nginxProxyEnv)
return docker.DoRollingUpdateContainer(host.DClient, imageCfg, hostCfg, NginxProxyContainerName, host.Address, WorkerRole) if err := docker.DoRollingUpdateContainer(host.DClient, imageCfg, hostCfg, NginxProxyContainerName, host.Address, WorkerRole); err != nil {
return err
}
} }
return nil return nil
} }