Add restore flag to use local state

cluster/defaults.go

@@ -120,6 +120,7 @@ type ExternalFlags struct {
 	GenerateCSR      bool
 	Local            bool
 	UpdateOnly       bool
+	UseLocalState    bool
 }
 
 func setDefaultIfEmptyMapValue(configMap map[string]string, key string, value string) {
@@ -606,13 +607,14 @@ func (c *Cluster) setCloudProvider() error {
 	return nil
 }
 
-func GetExternalFlags(local, updateOnly, disablePortCheck bool, configDir, clusterFilePath string) ExternalFlags {
+func GetExternalFlags(local, updateOnly, disablePortCheck, useLocalState bool, configDir, clusterFilePath string) ExternalFlags {
 	return ExternalFlags{
 		Local:            local,
 		UpdateOnly:       updateOnly,
 		DisablePortCheck: disablePortCheck,
 		ConfigDir:        configDir,
 		ClusterFilePath:  clusterFilePath,
+		UseLocalState:    useLocalState,
 	}
 }
 

cluster/state.go

@@ -53,7 +53,7 @@ func (c *Cluster) GetClusterState(ctx context.Context, fullState *FullState) (*C
 	}
 
 	// resetup external flags
-	flags := GetExternalFlags(false, false, false, c.ConfigDir, c.ConfigPath)
+	flags := GetExternalFlags(false, false, false, false, c.ConfigDir, c.ConfigPath)
 	currentCluster, err := InitClusterObject(ctx, fullState.CurrentState.RancherKubernetesEngineConfig, flags, fullState.CurrentState.EncryptionConfig)
 	if err != nil {
 		return nil, err

cmd/cert.go

@@ -91,7 +91,7 @@ func rotateRKECertificatesFromCli(ctx *cli.Context) error {
 		return err
 	}
 	// setting up the flags
-	externalFlags := cluster.GetExternalFlags(false, false, false, "", filePath)
+	externalFlags := cluster.GetExternalFlags(false, false, false, false, "", filePath)
 	// setting up rotate flags
 	rkeConfig.RotateCertificates = &v3.RotateCertificates{
 		CACertificates: rotateCACerts,
@@ -120,7 +120,7 @@ func generateCSRFromCli(ctx *cli.Context) error {
 		return err
 	}
 	// setting up the flags
-	externalFlags := cluster.GetExternalFlags(false, false, false, "", filePath)
+	externalFlags := cluster.GetExternalFlags(false, false, false, false, "", filePath)
 	externalFlags.CertificateDir = ctx.String("cert-dir")
 	externalFlags.CustomCerts = ctx.Bool("custom-certs")
 

cmd/encryption.go

@@ -55,7 +55,7 @@ func rotateEncryptionKeyFromCli(ctx *cli.Context) error {
 	}
 
 	// setting up the flags
-	flags := cluster.GetExternalFlags(false, false, false, "", filePath)
+	flags := cluster.GetExternalFlags(false, false, false, false, "", filePath)
 
 	return RotateEncryptionKey(context.Background(), rkeConfig, hosts.DialersOptions{}, flags)
 }

cmd/etcd.go

@@ -77,6 +77,10 @@ func EtcdCommand() cli.Command {
 			Name:  "custom-certs",
 			Usage: "Use custom certificates from a cert dir",
 		},
+		cli.BoolFlag{
+			Name:  "use-local-state",
+			Usage: "Use local state file (do not check or use snapshot archive for state file)",
+		},
 	}
 	snapshotRestoreFlags = append(append(snapshotFlags, snapshotRestoreFlags...), commonFlags...)
 
@@ -144,7 +148,13 @@ func RestoreEtcdSnapshot(
 	snapshotName string) (string, string, string, string, map[string]pki.CertificatePKI, error) {
 	var APIURL, caCrt, clientCert, clientKey string
 
-	log.Infof(ctx, "Checking if state file is included in snapshot file for %s", snapshotName)
+	rkeFullState := &cluster.FullState{}
+	stateFileRetrieved := false
+	// Local state file
+	stateFilePath := cluster.GetStateFilePath(flags.ClusterFilePath, flags.ConfigDir)
+
+	if !flags.UseLocalState {
+		log.Infof(ctx, "Checking if state file is included in snapshot file for [%s]", snapshotName)
 		// Creating temp cluster to check if snapshot archive contains state file and retrieve it
 		tempCluster, err := cluster.InitClusterObject(ctx, rkeConfig, flags, "")
 		if err != nil {
@@ -157,11 +167,6 @@ func RestoreEtcdSnapshot(
 			return APIURL, caCrt, clientCert, clientKey, nil, err
 		}
 
-	rkeFullState := &cluster.FullState{}
-	stateFileRetrieved := false
-
-	// Local state file
-	stateFilePath := cluster.GetStateFilePath(flags.ClusterFilePath, flags.ConfigDir)
 		// Extract state file from snapshot
 		stateFile, err := tempCluster.GetStateFileFromSnapshot(ctx, snapshotName)
 		// If state file is not in snapshot (or can't be retrieved), fallback to local state file
@@ -178,7 +183,14 @@ func RestoreEtcdSnapshot(
 			logrus.Infof("State file is successfully extracted from snapshot [%s]", snapshotName)
 			stateFileRetrieved = true
 		}
-
+	} else {
+		var err error
+		log.Infof(ctx, "Not checking if state file is included in snapshot file for [%s], using local state file [%s]", snapshotName, stateFilePath)
+		rkeFullState, err = cluster.ReadStateFile(ctx, stateFilePath)
+		if err != nil {
+			return APIURL, caCrt, clientCert, clientKey, nil, err
+		}
+	}
 	log.Infof(ctx, "Restoring etcd snapshot %s", snapshotName)
 
 	kubeCluster, err := cluster.InitClusterObject(ctx, rkeConfig, flags, rkeFullState.DesiredState.EncryptionConfig)
@@ -191,7 +203,7 @@ func RestoreEtcdSnapshot(
 	}
 
 	// If we can't retrieve state file from snapshot, and we don't have local, we need to check for legacy cluster
-	if !stateFileRetrieved {
+	if !stateFileRetrieved || flags.UseLocalState {
 		if err := checkLegacyCluster(ctx, kubeCluster, rkeFullState, flags); err != nil {
 			return APIURL, caCrt, clientCert, clientKey, nil, err
 		}
@@ -305,7 +317,7 @@ func SnapshotSaveEtcdHostsFromCli(ctx *cli.Context) error {
 		logrus.Warnf("Name of the snapshot is not specified using [%s]", etcdSnapshotName)
 	}
 	// setting up the flags
-	flags := cluster.GetExternalFlags(false, false, false, "", filePath)
+	flags := cluster.GetExternalFlags(false, false, false, false, "", filePath)
 
 	return SnapshotSaveEtcdHosts(context.Background(), rkeConfig, hosts.DialersOptions{}, flags, etcdSnapshotName)
 }
@@ -331,7 +343,10 @@ func RestoreEtcdSnapshotFromCli(ctx *cli.Context) error {
 		return fmt.Errorf("you must specify the snapshot name to restore")
 	}
 	// setting up the flags
-	flags := cluster.GetExternalFlags(false, false, false, "", filePath)
+	// flag to use local state file
+	useLocalState := ctx.Bool("use-local-state")
+
+	flags := cluster.GetExternalFlags(false, false, false, useLocalState, "", filePath)
 	// Custom certificates and certificate dir flags
 	flags.CertificateDir = ctx.String("cert-dir")
 	flags.CustomCerts = ctx.Bool("custom-certs")

cmd/remove.go

@@ -116,7 +116,7 @@ func clusterRemoveFromCli(ctx *cli.Context) error {
 	}
 
 	// setting up the flags
-	flags := cluster.GetExternalFlags(false, false, false, "", filePath)
+	flags := cluster.GetExternalFlags(false, false, false, false, "", filePath)
 
 	return ClusterRemove(context.Background(), rkeConfig, hosts.DialersOptions{}, flags)
 }
@@ -140,7 +140,7 @@ func clusterRemoveLocal(ctx *cli.Context) error {
 		return err
 	}
 	// setting up the flags
-	flags := cluster.GetExternalFlags(true, false, false, "", filePath)
+	flags := cluster.GetExternalFlags(true, false, false, false, "", filePath)
 
 	return ClusterRemove(context.Background(), rkeConfig, hosts.DialersOptions{}, flags)
 }

cmd/up.go

@@ -288,7 +288,7 @@ func clusterUpFromCli(ctx *cli.Context) error {
 	updateOnly := ctx.Bool("update-only")
 	disablePortCheck := ctx.Bool("disable-port-check")
 	// setting up the flags
-	flags := cluster.GetExternalFlags(false, updateOnly, disablePortCheck, "", filePath)
+	flags := cluster.GetExternalFlags(false, updateOnly, disablePortCheck, false, "", filePath)
 	// Custom certificates and certificate dir flags
 	flags.CertificateDir = ctx.String("cert-dir")
 	flags.CustomCerts = ctx.Bool("custom-certs")
@@ -323,7 +323,7 @@ func clusterUpLocal(ctx *cli.Context) error {
 	// setting up the dialers
 	dialers := hosts.GetDialerOptions(nil, hosts.LocalHealthcheckFactory, nil)
 	// setting up the flags
-	flags := cluster.GetExternalFlags(true, false, false, "", filePath)
+	flags := cluster.GetExternalFlags(true, false, false, false, "", filePath)
 
 	if ctx.Bool("init") {
 		return ClusterInit(context.Background(), rkeConfig, dialers, flags)
@@ -349,7 +349,7 @@ func clusterUpDind(ctx *cli.Context) error {
 	// setting up the dialers
 	dialers := hosts.GetDialerOptions(hosts.DindConnFactory, hosts.DindHealthcheckConnFactory, nil)
 	// setting up flags
-	flags := cluster.GetExternalFlags(false, false, disablePortCheck, "", filePath)
+	flags := cluster.GetExternalFlags(false, false, disablePortCheck, false, "", filePath)
 	flags.DinD = true
 
 	if ctx.Bool("init") {