Extract airgap.yaml once

Signed-off-by: Evans Mungai <evans@replicated.com>

Author: banjoh

cmd/installer/cli/install.go

@@ -455,7 +455,7 @@ func runInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.Run
 	}
 
 	logrus.Debugf("running install preflights")
-	if err := runInstallPreflights(ctx, flags, rc, installReporter.reporter); err != nil {
+	if err := runInstallPreflights(ctx, flags, rc, installReporter.reporter, airgapInfo); err != nil {
 		if errors.Is(err, preflights.ErrPreflightsHaveFail) {
 			return NewErrorNothingElseToAdd(err)
 		}

cmd/installer/cli/install_runpreflights.go

@@ -84,7 +84,7 @@ func runInstallRunPreflights(ctx context.Context, name string, flags InstallCmdF
 	}
 
 	logrus.Debugf("running install preflights")
-	if err := runInstallPreflights(ctx, flags, rc, nil); err != nil {
+	if err := runInstallPreflights(ctx, flags, rc, nil, airgapInfo); err != nil {
 		if errors.Is(err, preflights.ErrPreflightsHaveFail) {
 			return NewErrorNothingElseToAdd(err)
 		}
@@ -96,7 +96,7 @@ func runInstallRunPreflights(ctx context.Context, name string, flags InstallCmdF
 	return nil
 }
 
-func runInstallPreflights(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, metricsReporter metrics.ReporterInterface) error {
+func runInstallPreflights(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, metricsReporter metrics.ReporterInterface, airgapInfo *kotsv1beta1.Airgap) error {
 	replicatedAppURL := replicatedAppURL()
 	proxyRegistryURL := proxyRegistryURL()
 
@@ -107,12 +107,7 @@ func runInstallPreflights(ctx context.Context, flags InstallCmdFlags, rc runtime
 
 	// Calculate airgap storage space requirement (2x uncompressed size for controller nodes)
 	var controllerAirgapStorageSpace string
-	if flags.airgapBundle != "" {
-		airgapInfo, err := airgap.AirgapInfoFromPath(flags.airgapBundle)
-		if err != nil {
-			return fmt.Errorf("failed to get airgap info: %w", err)
-		}
-		// The first installed node is always a controller
+	if airgapInfo != nil {
 		controllerAirgapStorageSpace = preflights.CalculateAirgapStorageSpace(airgapInfo.Spec.UncompressedSize, true)
 	}
 

cmd/installer/cli/restore.go

@@ -36,6 +36,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
 	"github.com/replicatedhq/embedded-cluster/pkg/spinner"
 	"github.com/replicatedhq/embedded-cluster/pkg/versions"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	velerov1 "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
@@ -133,11 +134,13 @@ func runRestore(ctx context.Context, name string, flags InstallCmdFlags, rc runt
 		return err
 	}
 
+	var airgapInfo *kotsv1beta1.Airgap
 	if flags.isAirgap {
 		logrus.Debugf("checking airgap bundle matches binary")
 
 		// read file from path
-		airgapInfo, err := airgap.AirgapInfoFromPath(flags.airgapBundle)
+		var err error
+		airgapInfo, err = airgap.AirgapInfoFromPath(flags.airgapBundle)
 		if err != nil {
 			return fmt.Errorf("failed to get airgap bundle versions: %w", err)
 		}
@@ -200,7 +203,7 @@ func runRestore(ctx context.Context, name string, flags InstallCmdFlags, rc runt
 
 	switch state {
 	case ecRestoreStateNew:
-		err = runRestoreStepNew(ctx, name, flags, rc, &s3Store, skipStoreValidation)
+		err = runRestoreStepNew(ctx, name, flags, rc, &s3Store, skipStoreValidation, airgapInfo)
 		if err != nil {
 			return err
 		}
@@ -355,7 +358,7 @@ func runRestore(ctx context.Context, name string, flags InstallCmdFlags, rc runt
 	return nil
 }
 
-func runRestoreStepNew(ctx context.Context, name string, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, s3Store *s3BackupStore, skipStoreValidation bool) error {
+func runRestoreStepNew(ctx context.Context, name string, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, s3Store *s3BackupStore, skipStoreValidation bool, airgapInfo *kotsv1beta1.Airgap) error {
 	logrus.Debugf("checking if k0s is already installed")
 	err := verifyNoInstallation(name, "restore")
 	if err != nil {
@@ -387,7 +390,7 @@ func runRestoreStepNew(ctx context.Context, name string, flags InstallCmdFlags,
 	}
 
 	logrus.Debugf("running install preflights")
-	if err := runInstallPreflights(ctx, flags, rc, nil); err != nil {
+	if err := runInstallPreflights(ctx, flags, rc, nil, airgapInfo); err != nil {
 		if errors.Is(err, preflights.ErrPreflightsHaveFail) {
 			return NewErrorNothingElseToAdd(err)
 		}