Do not process online images in airgap mode for v1beta2 Helm charts

pkg/airgap/airgap.go

@@ -212,6 +212,7 @@ func CreateAppFromAirgap(opts CreateAirgapAppOpts) (finalError error) {
 		LicenseFile:         licenseFile.Name(),
 		ConfigFile:          configFile,
 		IdentityConfigFile:  identityConfigFile,
+		IsAirgap:            true,
 		AirgapRoot:          archiveDir,
 		AirgapBundle:        airgapBundle,
 		Silent:              !opts.IsAutomated,

pkg/airgap/update.go

@@ -161,6 +161,7 @@ func UpdateAppFromPath(a *apptypes.App, airgapRoot string, airgapBundlePath stri
 		Namespace:              appNamespace,
 		ConfigFile:             filepath.Join(archiveDir, "upstream", "userdata", "config.yaml"),
 		IdentityConfigFile:     identityConfigFile,
+		IsAirgap:               true,
 		AirgapRoot:             airgapRoot,
 		AirgapBundle:           airgapBundlePath,
 		InstallationFile:       filepath.Join(archiveDir, "upstream", "userdata", "installation.yaml"),

pkg/apparchive/helm-v1beta2.go

@@ -146,7 +146,7 @@ func WriteV1Beta2HelmCharts(opts WriteV1Beta2HelmChartsOptions) error {
 			return errors.Wrap(err, "failed to write values file")
 		}
 
-		if !opts.ProcessImageOptions.RewriteImages || opts.ProcessImageOptions.AirgapRoot != "" {
+		if !opts.ProcessImageOptions.RewriteImages || opts.ProcessImageOptions.IsAirgap {
 			// if an on-prem registry is not configured (which means it's an online installation)
 			// there's no need to process/copy the images as they will be pulled from their original registries or through the replicated proxy.
 			// if an on-prem registry is configured, but it's an airgap installation, we also don't need to process/copy the images

pkg/image/airgap.go

@@ -114,7 +114,7 @@ func CopyAirgapImages(opts imagetypes.ProcessImageOptions, log *logger.CLILogger
 		if err != nil {
 			return errors.Wrap(err, "failed to push images from bundle")
 		}
-	} else {
+	} else if opts.AirgapRoot != "" {
 		err := TagAndPushImagesFromPath(opts.AirgapRoot, pushOpts)
 		if err != nil {
 			return errors.Wrap(err, "failed to push images from dir")

pkg/midstream/write.go

@@ -111,15 +111,15 @@ func WriteMidstream(opts WriteOptions) (*Midstream, error) {
 			opts.Log.ActionWithSpinner("Copying images")
 			io.WriteString(opts.ProcessImageOptions.ReportWriter, "Copying images\n")
 
-			if opts.ProcessImageOptions.AirgapRoot == "" {
-				err := image.CopyOnlineImages(opts.ProcessImageOptions, allImages, opts.KotsKinds, opts.License, dockerHubRegistryCreds, opts.Log)
+			if opts.ProcessImageOptions.IsAirgap {
+				err := image.CopyAirgapImages(opts.ProcessImageOptions, opts.Log)
 				if err != nil {
-					return nil, errors.Wrap(err, "failed to copy online images")
+					return nil, errors.Wrap(err, "failed to copy airgap images")
 				}
 			} else {
-				err := image.CopyAirgapImages(opts.ProcessImageOptions, opts.Log)
+				err := image.CopyOnlineImages(opts.ProcessImageOptions, allImages, opts.KotsKinds, opts.License, dockerHubRegistryCreds, opts.Log)
 				if err != nil {
-					return nil, errors.Wrap(err, "failed to copy airgap images")
+					return nil, errors.Wrap(err, "failed to copy online images")
 				}
 			}
 		}

pkg/pull/pull.go

@@ -48,6 +48,7 @@ type PullOptions struct {
 	LicenseFile             string
 	LicenseEndpointOverride string // only used for testing
 	InstallationFile        string
+	IsAirgap                bool
 	AirgapRoot              string
 	AirgapBundle            string
 	ConfigFile              string
@@ -295,7 +296,7 @@ func Pull(upstreamURI string, pullOptions PullOptions) (string, error) {
 		IsOpenShift:         k8sutil.IsOpenShift(clientset),
 		IsGKEAutopilot:      k8sutil.IsGKEAutopilot(clientset),
 		IncludeMinio:        pullOptions.IncludeMinio,
-		IsAirgap:            pullOptions.AirgapRoot != "",
+		IsAirgap:            pullOptions.IsAirgap,
 		KotsadmID:           k8sutil.GetKotsadmID(clientset),
 		AppID:               pullOptions.AppID,
 	}
@@ -321,7 +322,7 @@ func Pull(upstreamURI string, pullOptions PullOptions) (string, error) {
 		Log:               log,
 		AppSlug:           pullOptions.AppSlug,
 		Sequence:          pullOptions.AppSequence,
-		IsAirgap:          pullOptions.AirgapRoot != "",
+		IsAirgap:          pullOptions.IsAirgap,
 	}
 	log.ActionWithSpinner("Rendering KOTS custom resources")
 	io.WriteString(pullOptions.ReportWriter, "Rendering KOTS custom resources\n")
@@ -339,7 +340,7 @@ func Pull(upstreamURI string, pullOptions PullOptions) (string, error) {
 	}
 	log.FinishSpinner()
 
-	needsConfig, err := kotsadmconfig.NeedsConfiguration(pullOptions.AppSlug, pullOptions.AppSequence, pullOptions.AirgapRoot != "", renderedKotsKinds, registrySettings)
+	needsConfig, err := kotsadmconfig.NeedsConfiguration(pullOptions.AppSlug, pullOptions.AppSequence, pullOptions.IsAirgap, renderedKotsKinds, registrySettings)
 	if err != nil {
 		return "", errors.Wrap(err, "failed to check if version needs configuration")
 	}
@@ -351,7 +352,7 @@ func Pull(upstreamURI string, pullOptions PullOptions) (string, error) {
 		RegistrySettings: pullOptions.RewriteImageOptions,
 		CopyImages:       !pullOptions.RewriteImageOptions.IsReadOnly,
 		RootDir:          pullOptions.RootDir,
-		IsAirgap:         pullOptions.AirgapRoot != "",
+		IsAirgap:         pullOptions.IsAirgap,
 		AirgapRoot:       pullOptions.AirgapRoot,
 		AirgapBundle:     pullOptions.AirgapBundle,
 		CreateAppDir:     pullOptions.CreateAppDir,
@@ -362,7 +363,7 @@ func Pull(upstreamURI string, pullOptions PullOptions) (string, error) {
 		if err := kotsutil.WriteKotsKinds(renderedKotsKindsMap, u.GetKotsKindsDir(writeUpstreamOptions)); err != nil {
 			return "", errors.Wrap(err, "failed to write the rendered kots kinds")
 		}
-		if processImageOptions.RewriteImages && processImageOptions.AirgapRoot != "" {
+		if processImageOptions.RewriteImages && processImageOptions.IsAirgap {
 			// if this is an airgap install, we still need to process the images
 			if err := image.CopyAirgapImages(processImageOptions, log); err != nil {
 				return "", errors.Wrap(err, "failed to copy airgap images")

pkg/tests/pull/cases/configcontext/testcase.yaml

@@ -2,7 +2,6 @@ Name: test helm pull
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/configcontext/upstream
   RootDir: cases/configcontext/results

pkg/tests/pull/cases/customhostnames/testcase.yaml

@@ -2,7 +2,6 @@ Name: test custom hostnames
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/customhostnames/upstream
   RootDir: cases/customhostnames/results

pkg/tests/pull/cases/kotskinds/testcase.yaml

@@ -2,7 +2,6 @@ Name: test templating kots kinds
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/kotskinds/upstream
   RootDir: cases/kotskinds/results

pkg/tests/pull/cases/multidoc/testcase.yaml

@@ -2,7 +2,6 @@ Name: test multiple docs in a single file
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/multidoc/upstream
   RootDir: cases/multidoc/results

pkg/tests/pull/cases/needsconfig/testcase.yaml

@@ -2,7 +2,6 @@ Name: test pulling with unset required config items
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/needsconfig/upstream
   RootDir: cases/needsconfig/results

pkg/tests/pull/cases/replicatedhelm/testcase.yaml

@@ -2,7 +2,6 @@ Name: test replicated helm pull without rewrite
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/replicatedhelm/upstream
   RootDir: cases/replicatedhelm/results

pkg/tests/pull/cases/samechartvariations/testcase.yaml

@@ -4,7 +4,6 @@ Name: test deploying variations of same helm chart
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/samechartvariations/upstream
   RootDir: cases/samechartvariations/results

pkg/tests/pull/cases/simple/testcase.yaml

@@ -2,7 +2,6 @@ Name: test simple pull
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/simple/upstream
   RootDir: cases/simple/results

pkg/tests/pull/cases/subchart-alias/testcase.yaml

@@ -2,7 +2,6 @@ Name: subchart alias
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/subchart-alias/upstream
   RootDir: cases/subchart-alias/results

pkg/tests/pull/cases/subchart-crds/testcase.yaml

@@ -2,7 +2,6 @@ Name: test subchart crds
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/subchart-crds/upstream
   RootDir: cases/subchart-crds/results

pkg/tests/pull/cases/subcharts/testcase.yaml

@@ -2,7 +2,6 @@ Name: test subcharts pull
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/subcharts/upstream
   RootDir: cases/subcharts/results

pkg/tests/pull/cases/taganddigest-norewrite/testcase.yaml

@@ -2,7 +2,6 @@ Name: test tag and digest no rewrite
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/taganddigest-norewrite/upstream
   RootDir: cases/taganddigest-norewrite/results

pkg/tests/pull/cases/taganddigest-rewrite/testcase.yaml

@@ -2,7 +2,6 @@ Name: test tag and digest with rewrite
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/taganddigest-rewrite/upstream
   RootDir: cases/taganddigest-rewrite/results

pkg/tests/pull/cases/v1beta2-charts/testcase.yaml

@@ -2,7 +2,6 @@ Name: test v1beta2 charts
 PullOptions:
   Namespace: app-namespace
   ExcludeAdminConsole: true
-  IsAirgap: true
   Silent: true
   LocalPath: cases/v1beta2-charts/upstream
   RootDir: cases/v1beta2-charts/results