pass embedded cluster artifacts in upstream upgrade

Author: Craig O'Donnell

pkg/airgap/update.go

@@ -46,15 +46,15 @@ func UpdateAppFromAirgap(a *apptypes.App, airgapBundlePath string, deploy bool,
 	}
 	defer os.RemoveAll(airgapRoot)
 
-	err = UpdateAppFromPath(a, airgapRoot, airgapBundlePath, deploy, skipPreflights, skipCompatibilityCheck)
+	err = UpdateAppFromPath(a, airgapRoot, airgapBundlePath, deploy, skipPreflights, skipCompatibilityCheck, nil)
 	if err != nil {
 		return errors.Wrap(err, "failed to update app")
 	}
 
 	return nil
 }
 
-func UpdateAppFromPath(a *apptypes.App, airgapRoot string, airgapBundlePath string, deploy bool, skipPreflights bool, skipCompatibilityCheck bool) error {
+func UpdateAppFromPath(a *apptypes.App, airgapRoot string, airgapBundlePath string, deploy bool, skipPreflights bool, skipCompatibilityCheck bool, embeddedClusterArtifacts []string) error {
 	if err := store.GetStore().SetTaskStatus("update-download", "Processing package...", "running"); err != nil {
 		return errors.Wrap(err, "failed to set tasks status")
 	}
@@ -196,6 +196,13 @@ func UpdateAppFromPath(a *apptypes.App, airgapRoot string, airgapBundlePath stri
 		return errors.Wrap(err, "cannot install")
 	}
 
+	if len(embeddedClusterArtifacts) > 0 {
+		afterKotsKinds.Installation.Spec.EmbeddedClusterArtifacts = embeddedClusterArtifacts
+		if err := kotsutil.SaveInstallation(&afterKotsKinds.Installation, filepath.Join(archiveDir, "upstream")); err != nil {
+			return errors.Wrap(err, "failed to save installation")
+		}
+	}
+
 	// Create the app in the db
 	newSequence, err := store.GetStore().CreateAppVersion(a.ID, &baseSequence, archiveDir, "Airgap Update", skipPreflights, &version.DownstreamGitOps{}, render.Renderer{})
 	if err != nil {

pkg/handlers/update.go

@@ -162,25 +162,16 @@ func (h *Handler) AppUpdateCheck(w http.ResponseWriter, r *http.Request) {
 		}
 		defer os.RemoveAll(rootDir)
 
-		formReader, err := r.MultipartReader()
-		if err != nil {
-			logger.Error(errors.Wrap(err, "failed to get multipart reader"))
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		for {
-			part, err := formReader.NextPart()
+		formFiles := []string{"airgap.yaml", "app.tar.gz"}
+		for _, formFile := range formFiles {
+			airgapFile, hdr, err := r.FormFile(formFile)
 			if err != nil {
-				if err == io.EOF {
-					break
-				}
-				logger.Error(errors.Wrap(err, "failed to get next part"))
+				logger.Error(errors.Wrapf(err, "failed to get form file %s", formFile))
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
 
-			fileName := filepath.Join(rootDir, part.FormName())
+			fileName := filepath.Join(rootDir, hdr.Filename)
 			file, err := os.Create(fileName)
 			if err != nil {
 				logger.Error(errors.Wrap(err, "failed to create file"))
@@ -189,21 +180,25 @@ func (h *Handler) AppUpdateCheck(w http.ResponseWriter, r *http.Request) {
 			}
 			defer file.Close()
 
-			_, err = io.Copy(file, part)
+			_, err = io.Copy(file, airgapFile)
 			if err != nil {
-				logger.Error(errors.Wrap(err, "failed to copy part data"))
+				logger.Error(errors.Wrapf(err, "failed to copy form file %s", formFile))
 				w.WriteHeader(http.StatusInternalServerError)
 				return
 			}
-			file.Close()
+		}
+
+		var embeddedClusterArtifacts []string
+		if util.IsEmbeddedCluster() && r.FormValue("embeddedClusterArtifacts") != "" {
+			embeddedClusterArtifacts = strings.Split(r.FormValue("embeddedClusterArtifacts"), "\n")
 		}
 
 		finishedChan := make(chan error)
 		defer close(finishedChan)
 
 		tasks.StartUpdateTaskMonitor("update-download", finishedChan)
 
-		err = airgap.UpdateAppFromPath(kotsApp, rootDir, "", deploy, skipPreflights, skipCompatibilityCheck)
+		err = airgap.UpdateAppFromPath(kotsApp, rootDir, "", deploy, skipPreflights, skipCompatibilityCheck, embeddedClusterArtifacts)
 		if err != nil {
 			finishedChan <- err
 

pkg/upstream/upgrade.go

@@ -57,6 +57,8 @@ func Upgrade(appSlug string, options UpgradeOptions) (*UpgradeResponse, error) {
 		log.Silence()
 	}
 
+	var embeddedClusterArtifacts []string
+
 	if options.AirgapBundle != "" {
 		pushOptions := imagetypes.PushImagesOptions{
 			Registry: registrytypes.RegistryOptions{
@@ -69,10 +71,11 @@ func Upgrade(appSlug string, options UpgradeOptions) (*UpgradeResponse, error) {
 		}
 
 		if !options.DisableImagePush {
-			_, err := image.TagAndPushImagesFromBundle(options.AirgapBundle, pushOptions)
+			result, err := image.TagAndPushImagesFromBundle(options.AirgapBundle, pushOptions)
 			if err != nil {
 				return nil, errors.Wrap(err, "failed to tag and push app images from path")
 			}
+			embeddedClusterArtifacts = result.EmbeddedClusterArtifacts
 		}
 	}
 
@@ -98,6 +101,12 @@ func Upgrade(appSlug string, options UpgradeOptions) (*UpgradeResponse, error) {
 			return nil, errors.Wrap(err, "failed to create part from app.tar.gz")
 		}
 
+		if len(embeddedClusterArtifacts) > 0 {
+			if err := createPartFromString(writer, []byte(strings.Join(embeddedClusterArtifacts, "\n")), "embeddedClusterArtifacts"); err != nil {
+				return nil, errors.Wrap(err, "failed to create part from embeddedClusterArtifacts")
+			}
+		}
+
 		err := writer.Close()
 		if err != nil {
 			return nil, errors.Wrap(err, "failed to close multi-part writer")
@@ -242,3 +251,17 @@ func createPartFromFile(partWriter *multipart.Writer, path string, fileName stri
 
 	return nil
 }
+
+func createPartFromString(partWriter *multipart.Writer, content []byte, name string) error {
+	part, err := partWriter.CreateFormField(name)
+	if err != nil {
+		return errors.Wrap(err, "failed to create form field")
+	}
+
+	_, err = part.Write(content)
+	if err != nil {
+		return errors.Wrap(err, "failed to write part")
+	}
+
+	return nil
+}