Pass airgap info to the api

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

Author: banjoh

api/api.go

@@ -19,6 +19,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
 	httpSwagger "github.com/swaggo/http-swagger/v2"
 )
@@ -50,6 +51,7 @@ type API struct {
 	tlsConfig         types.TLSConfig
 	licenseFile       string
 	airgapBundle      string
+	airgapInfo        *kotsv1beta1.Airgap
 	configValues      string
 	endUserConfig     *ecv1beta1.Config
 	logger            logrus.FieldLogger
@@ -125,6 +127,12 @@ func WithAirgapBundle(airgapBundle string) APIOption {
 	}
 }
 
+func WithAirgapInfo(airgapInfo *kotsv1beta1.Airgap) APIOption {
+	return func(a *API) {
+		a.airgapInfo = airgapInfo
+	}
+}
+
 func WithConfigValues(configValues string) APIOption {
 	return func(a *API) {
 		a.configValues = configValues
@@ -190,6 +198,7 @@ func New(password string, opts ...APIOption) (*API, error) {
 			install.WithTLSConfig(api.tlsConfig),
 			install.WithLicenseFile(api.licenseFile),
 			install.WithAirgapBundle(api.airgapBundle),
+			install.WithAirgapInfo(api.airgapInfo),
 			install.WithConfigValues(api.configValues),
 			install.WithEndUserConfig(api.endUserConfig),
 		)

api/controllers/install/controller.go

@@ -16,6 +16,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
 )
 
@@ -55,6 +56,7 @@ type InstallController struct {
 	tlsConfig            types.TLSConfig
 	licenseFile          string
 	airgapBundle         string
+	airgapInfo           *kotsv1beta1.Airgap
 	configValues         string
 	endUserConfig        *ecv1beta1.Config
 	mu                   sync.RWMutex
@@ -122,6 +124,12 @@ func WithAirgapBundle(airgapBundle string) InstallControllerOption {
 	}
 }
 
+func WithAirgapInfo(airgapInfo *kotsv1beta1.Airgap) InstallControllerOption {
+	return func(c *InstallController) {
+		c.airgapInfo = airgapInfo
+	}
+}
+
 func WithConfigValues(configValues string) InstallControllerOption {
 	return func(c *InstallController) {
 		c.configValues = configValues

api/controllers/install/hostpreflight.go

@@ -8,7 +8,6 @@ import (
 	"github.com/replicatedhq/embedded-cluster/api/pkg/utils"
 	"github.com/replicatedhq/embedded-cluster/api/types"
 	"github.com/replicatedhq/embedded-cluster/pkg-new/preflights"
-	"github.com/replicatedhq/embedded-cluster/pkg/airgap"
 	"github.com/replicatedhq/embedded-cluster/pkg/netutils"
 )
 
@@ -18,12 +17,8 @@ func (c *InstallController) RunHostPreflights(ctx context.Context, opts RunHostP
 
 	// Calculate airgap storage space requirement (2x uncompressed size for controller nodes)
 	var controllerAirgapStorageSpace string
-	if c.airgapBundle != "" {
-		airgapInfo, err := airgap.AirgapInfoFromPath(c.airgapBundle)
-		if err != nil {
-			return fmt.Errorf("failed to get airgap info: %w", err)
-		}
-		controllerAirgapStorageSpace = preflights.CalculateAirgapStorageSpace(airgapInfo.Spec.UncompressedSize, true)
+	if c.airgapInfo != nil {
+		controllerAirgapStorageSpace = preflights.CalculateAirgapStorageSpace(c.airgapInfo.Spec.UncompressedSize, true)
 	}
 
 	// Prepare host preflights

cmd/installer/cli/api.go

@@ -24,6 +24,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
 	"github.com/replicatedhq/embedded-cluster/web"
+	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
 )
 
@@ -37,6 +38,7 @@ type apiConfig struct {
 	ManagerPort     int
 	LicenseFile     string
 	AirgapBundle    string
+	AirgapInfo      *kotsv1beta1.Airgap
 	ConfigValues    string
 	ReleaseData     *release.ReleaseData
 	EndUserConfig   *ecv1beta1.Config
@@ -89,6 +91,7 @@ func serveAPI(ctx context.Context, listener net.Listener, cert tls.Certificate,
 		api.WithTLSConfig(config.TLSConfig),
 		api.WithLicenseFile(config.LicenseFile),
 		api.WithAirgapBundle(config.AirgapBundle),
+		api.WithAirgapInfo(config.AirgapInfo),
 		api.WithConfigValues(config.ConfigValues),
 		api.WithEndUserConfig(config.EndUserConfig),
 	)

cmd/installer/cli/install.go

@@ -112,7 +112,7 @@ func InstallCmd(ctx context.Context, name string) *cobra.Command {
 			}
 
 			if flags.enableManagerExperience {
-				return runManagerExperienceInstall(ctx, flags, rc)
+				return runManagerExperienceInstall(ctx, flags, rc, airgapInfo)
 			}
 
 			_ = rc.SetEnv()
@@ -359,7 +359,7 @@ func cidrConfigFromCmd(cmd *cobra.Command) (*newconfig.CIDRConfig, error) {
 	return cidrCfg, nil
 }
 
-func runManagerExperienceInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig) (finalErr error) {
+func runManagerExperienceInstall(ctx context.Context, flags InstallCmdFlags, rc runtimeconfig.RuntimeConfig, airgapInfo *kotsv1beta1.Airgap) (finalErr error) {
 	// this is necessary because the api listens on all interfaces,
 	// and we only know the interface to use when the user selects it in the ui
 	ipAddresses, err := netutils.ListAllValidIPAddresses()
@@ -428,6 +428,7 @@ func runManagerExperienceInstall(ctx context.Context, flags InstallCmdFlags, rc
 		ManagerPort:   flags.managerPort,
 		LicenseFile:   flags.licenseFile,
 		AirgapBundle:  flags.airgapBundle,
+		AirgapInfo:    airgapInfo,
 		ConfigValues:  flags.configValues,
 		ReleaseData:   release.GetReleaseData(),
 		EndUserConfig: eucfg,