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

Ensure certs are availaible for restore

Browse Source
This commit is contained in:
moelsayed
2019-03-02 04:28:40 +02:00
committed by Alena Prokharchyk
parent 9d85116568
commit b80785e75e
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cluster/etcd.go
View File

@@ -7,8 +7,10 @@ import (
"github.com/rancher/rke/docker"
"github.com/rancher/rke/hosts"
"github.com/rancher/rke/log"
"github.com/rancher/rke/pki"
"github.com/rancher/rke/services"
"github.com/rancher/rke/util"
"golang.org/x/sync/errgroup"
)
func (c *Cluster) SnapshotEtcd(ctx context.Context, snapshotName string) error {
@@ -24,6 +26,31 @@ func (c *Cluster) SnapshotEtcd(ctx context.Context, snapshotName string) error {
return nil
}
func (c *Cluster) DeployRestoreCerts(ctx context.Context, clusterCerts map[string]pki.CertificatePKI) error {
var errgrp errgroup.Group
hostsQueue := util.GetObjectQueue(c.EtcdHosts)
restoreCerts := map[string]pki.CertificatePKI{}
for _, n := range []string{pki.CACertName, pki.KubeNodeCertName, pki.KubeNodeCertName} {
restoreCerts[n] = clusterCerts[n]
}
for w := 0; w < WorkerThreads; w++ {
errgrp.Go(func() error {
var errList []error
for host := range hostsQueue {
err := pki.DeployCertificatesOnPlaneHost(ctx, host.(*hosts.Host), c.RancherKubernetesEngineConfig, restoreCerts, c.SystemImages.CertDownloader, c.PrivateRegistriesMap, false)
if err != nil {
errList = append(errList, err)
}
}
return util.ErrList(errList)
})
}
if err := errgrp.Wait(); err != nil {
return err
}
return nil
}
func (c *Cluster) PrepareBackup(ctx context.Context, snapshotPath string) error {
// local backup case
var backupServer *hosts.Host

3
cluster/hosts.go
View File

@@ -12,7 +12,7 @@ import (
"github.com/rancher/rke/pki"
"github.com/rancher/rke/services"
"github.com/rancher/rke/util"
"github.com/rancher/types/apis/management.cattle.io/v3"
v3 "github.com/rancher/types/apis/management.cattle.io/v3"
"github.com/sirupsen/logrus"
"golang.org/x/sync/errgroup"
)
@@ -127,7 +127,6 @@ func (c *Cluster) SetUpHosts(ctx context.Context, flags ExternalFlags) error {
}
hostList := hosts.GetUniqueHostList(c.EtcdHosts, c.ControlPlaneHosts, c.WorkerHosts)
var errgrp errgroup.Group
hostsQueue := util.GetObjectQueue(hostList)
for w := 0; w < WorkerThreads; w++ {
errgrp.Go(func() error {

4
cmd/etcd.go
View File

@@ -131,6 +131,10 @@ func RestoreEtcdSnapshot(
if err := kubeCluster.TunnelHosts(ctx, flags); err != nil {
return err
}
// if we fail after cleanup, we can't find the certs to do the download, we need to redeploy them
if err := kubeCluster.DeployRestoreCerts(ctx, rkeFullState.DesiredState.CertificatesBundle); err != nil {
return err
}
// first download and check
if err := kubeCluster.PrepareBackup(ctx, snapshotName); err != nil {
return err