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

Fix sidekick upgrade

Browse Source
This commit is contained in:
moelsayed
2018-08-02 02:33:29 +02:00
parent 28db358ebd
commit a1a9ba531b
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
services/services.go
View File

@@ -46,16 +46,28 @@ func runSidekick(ctx context.Context, host *hosts.Host, prsMap map[string]v3.Pri
if err != nil { if err != nil {
return err return err
} }
imageCfg, hostCfg, _ := GetProcessConfig(sidecarProcess)
isUpgradable := false
if isRunning { if isRunning {
log.Infof(ctx, "[%s] Sidekick container already created on host [%s]", SidekickServiceName, host.Address) isUpgradable, err = docker.IsContainerUpgradable(ctx, host.DClient, imageCfg, hostCfg, SidekickContainerName, host.Address, SidekickServiceName)
return nil if err != nil {
return err
}
if !isUpgradable {
log.Infof(ctx, "[%s] Sidekick container already created on host [%s]", SidekickServiceName, host.Address)
return nil
}
} }
imageCfg, hostCfg, _ := GetProcessConfig(sidecarProcess) if err := docker.UseLocalOrPull(ctx, host.DClient, host.Address, sidecarProcess.Image, SidekickServiceName, prsMap); err != nil {
sidecarImage := sidecarProcess.Image
if err := docker.UseLocalOrPull(ctx, host.DClient, host.Address, sidecarImage, SidekickServiceName, prsMap); err != nil {
return err return err
} }
if isUpgradable {
if err := docker.DoRemoveContainer(ctx, host.DClient, SidekickContainerName, host.Address); err != nil {
return err
}
}
if _, err := docker.CreateContainer(ctx, host.DClient, host.Address, SidekickContainerName, imageCfg, hostCfg); err != nil { if _, err := docker.CreateContainer(ctx, host.DClient, host.Address, SidekickContainerName, imageCfg, hostCfg); err != nil {
return err return err
} }