rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-09-01 15:06:23 +00:00
Code Issues Releases Wiki Activity

changed etcd restoreImage to rke-tools for etcd >=3.5.7

Browse Source
This commit is contained in:
vardhaman22
2023-09-25 21:02:14 +05:30
parent f329e90778
commit adaec2efa7
2 changed files with 97 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
cluster/etcd.go
View File

@@ -16,6 +16,8 @@ import (
"golang.org/x/sync/errgroup"
)
const MinEtcdVersionWithDistrolessImage = "v3.5.7"
func (c *Cluster) SnapshotEtcd(ctx context.Context, snapshotName string) error {
backupImage := c.getBackupImage()
containerTimeout := DefaultEtcdBackupConfigTimeout
@@ -225,13 +227,14 @@ func (c *Cluster) RestoreEtcdSnapshot(ctx context.Context, snapshotPath string)
// Start restore process on all etcd hosts
initCluster := services.GetEtcdInitialCluster(c.EtcdHosts)
backupImage := c.getBackupImage()
restoreImage := c.getRestoreImage()
for _, host := range c.EtcdHosts {
containerTimeout := DefaultEtcdBackupConfigTimeout
if c.Services.Etcd.BackupConfig != nil && c.Services.Etcd.BackupConfig.Timeout > 0 {
containerTimeout = c.Services.Etcd.BackupConfig.Timeout
}
newCtx := context.WithValue(ctx, docker.WaitTimeoutContextKey, containerTimeout)
if err := services.RestoreEtcdSnapshot(newCtx, host, c.PrivateRegistriesMap, c.SystemImages.Etcd, backupImage,
if err := services.RestoreEtcdSnapshot(newCtx, host, c.PrivateRegistriesMap, restoreImage, backupImage,
snapshotPath, initCluster, c.Services.Etcd, c.Version); err != nil {
return fmt.Errorf("[etcd] Failed to restore etcd snapshot: %v", err)
}
@@ -281,3 +284,35 @@ func (c *Cluster) getBackupImage() string {
logrus.Debugf("[etcd] Image used for etcd snapshot is: [%s]", rkeToolsImage)
return rkeToolsImage
}
func (c *Cluster) getRestoreImage() string {
// use etcd image for restore in case of custom system image
if !strings.Contains(c.SystemImages.Etcd, "rancher/mirrored-coreos-etcd") {
return c.SystemImages.Etcd
}
etcdImageTag, err := util.GetImageTagFromImage(c.SystemImages.Etcd)
if err != nil {
logrus.Errorf("[etcd] getRestoreImage: error extracting tag from etcd image: %v", err)
return ""
}
etcdVersion, err := util.StrToSemVer(etcdImageTag)
if err != nil {
logrus.Errorf("[etcd] getRestoreImage: error converting etcd image tag to semver: %v", err)
return ""
}
minEtcdVersionWithDistrolessImage, err := util.StrToSemVer(MinEtcdVersionWithDistrolessImage)
if err != nil {
logrus.Errorf("[etcd] getRestoreImage: error converting min distroless etcd image version to semver: %v", err)
return ""
}
if etcdVersion.LessThan(*minEtcdVersionWithDistrolessImage) {
return c.SystemImages.Etcd
}
return c.getBackupImage()
}