Merge pull request #1082 from replicatedhq/divolgin/airgap

Images are in the images folder
replicatedhq · Sep 10, 2020 · 8d56ea5 · 8d56ea5
2 parents 7d0c586 + 8281aa0
commit 8d56ea5
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/pkg/rewrite/rewrite.go b/pkg/rewrite/rewrite.go
@@ -321,11 +321,3 @@ func Rewrite(rewriteOptions RewriteOptions) error {
 
 	return nil
 }
-
-func imagesDirFromOptions(upstream *upstreamtypes.Upstream, rewriteOptions RewriteOptions) string {
-	if rewriteOptions.CreateAppDir {
-		return filepath.Join(rewriteOptions.RootDir, upstream.Name, "images")
-	}
-
-	return filepath.Join(rewriteOptions.RootDir, "images")
-}
diff --git a/pkg/upstream/push_images.go b/pkg/upstream/push_images.go
@@ -31,7 +31,7 @@ func TagAndPushUpstreamImages(u *types.Upstream, options PushUpstreamImageOption
 		ProgressWriter: options.ReportWriter,
 		LogForUI:       true,
 	}
-	images, err := kotsadm.TagAndPushAppImages(options.RootDir, pushOpts)
+	images, err := kotsadm.TagAndPushAppImages(options.ImagesDir, pushOpts)
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to push images")
 	}