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

Merge pull request #836 from moelsayed/change_entrypoint

Browse Source 
Fix sidekick upgrade issue and change services entry point
This commit is contained in:
Denise
2018-08-03 11:38:45 -07:00
committed by GitHub
parent 39b5ac1345 45f4a803ec
commit 16e63092f9
50 changed files with 17083 additions and 13861 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
services/etcd.go
View File

@@ -226,7 +226,7 @@ func RunEtcdSnapshotSave(ctx context.Context, etcdHost *hosts.Host, prsMap map[s
log.Infof(ctx, "[etcd] Saving snapshot [%s] on host [%s]", name, etcdHost.Address)
imageCfg := &container.Config{
Cmd: []string{
"/opt/rke/rke-etcd-backup",
"/opt/rke-tools/rke-etcd-backup",
"rolling-backup",
"--cacert", pki.GetCertPath(pki.CACertName),
"--cert", pki.GetCertPath(pki.KubeNodeCertName),

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 {
return err
}
imageCfg, hostCfg, _ := GetProcessConfig(sidecarProcess)
isUpgradable := false
if isRunning {
log.Infof(ctx, "[%s] Sidekick container already created on host [%s]", SidekickServiceName, host.Address)
return nil
isUpgradable, err = docker.IsContainerUpgradable(ctx, host.DClient, imageCfg, hostCfg, SidekickContainerName, host.Address, SidekickServiceName)
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)
sidecarImage := sidecarProcess.Image
if err := docker.UseLocalOrPull(ctx, host.DClient, host.Address, sidecarImage, SidekickServiceName, prsMap); err != nil {
if err := docker.UseLocalOrPull(ctx, host.DClient, host.Address, sidecarProcess.Image, SidekickServiceName, prsMap); err != nil {
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 {
return err
}