Merge remote-tracking branch 'origin/main' into k0s-1-28-7

Author: ricardomaraschini

.github/workflows/pull-request.yaml

@@ -125,8 +125,14 @@ jobs:
         export SHORT_SHA=dev-$(git rev-parse --short=7 HEAD)
         
         echo "This PR has been released (on staging) and is available for download with a embedded-cluster-smoke-test-staging-app [license ID](https://vendor.staging.replicated.com/apps/embedded-cluster-smoke-test-staging-app/customers?sort=name-asc)." > download-link.txt
+        echo "" >> download-link.txt
+        echo "Online Installer:" >> download-link.txt
         echo "\`\`\`" >> download-link.txt
-        echo "curl https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/${SHORT_SHA} -H \"Authorization: \$EC_SMOKE_TEST_LICENSE_ID\" -o embedded-cluster-smoke-test-staging-app-ci.tgz" >> download-link.txt
+        echo "curl \"https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci/appver-${SHORT_SHA}\" -H \"Authorization: \$EC_SMOKE_TEST_LICENSE_ID\" -o embedded-cluster-smoke-test-staging-app-ci.tgz" >> download-link.txt
+        echo "\`\`\`" >> download-link.txt
+        echo "Airgap Installer (may take a few minutes before the airgap bundle is built):" >> download-link.txt
+        echo "\`\`\`" >> download-link.txt
+        echo "curl \"https://staging.replicated.app/embedded/embedded-cluster-smoke-test-staging-app/ci-airgap/appver-${SHORT_SHA}?airgap=true\" -H \"Authorization: \$EC_SMOKE_TEST_LICENSE_ID\" -o embedded-cluster-smoke-test-staging-app-ci.tgz" >> download-link.txt
         echo "\`\`\`" >> download-link.txt
         echo "Happy debugging!" >> download-link.txt
         cat download-link.txt

cmd/local-artifact-mirror/pull.go

@@ -171,14 +171,18 @@ var binariesCommand = &cli.Command{
 			logrus.Infof("removing temporary directory %s", location)
 			os.RemoveAll(location)
 		}()
-
 		bin := filepath.Join(location, EmbeddedClusterBinaryArtifactName)
-		if err := os.Chmod(bin, 0755); err != nil {
+		namedBin := filepath.Join(location, in.Spec.BinaryName)
+		if err := os.Rename(bin, namedBin); err != nil {
+			return fmt.Errorf("unable to rename binary: %w", err)
+		}
+
+		if err := os.Chmod(namedBin, 0755); err != nil {
 			return fmt.Errorf("unable to change permissions on %s: %w", bin, err)
 		}
 
 		out := bytes.NewBuffer(nil)
-		cmd := exec.Command(bin, "materialize")
+		cmd := exec.Command(namedBin, "materialize")
 		cmd.Stdout = out
 		cmd.Stderr = out
 
@@ -190,14 +194,6 @@ var binariesCommand = &cli.Command{
 
 		logrus.Infof("embedded cluster binaries materialized")
 
-		targetBinaryName := filepath.Join(defaults.EmbeddedClusterBinsSubDir(), EmbeddedClusterBinaryArtifactName)
-		if in.Spec.BinaryName != "" {
-			targetBinaryName = filepath.Join(defaults.EmbeddedClusterBinsSubDir(), in.Spec.BinaryName)
-		}
-
-		if err := helpers.MoveFile(bin, targetBinaryName); err != nil {
-			return fmt.Errorf("unable to move embedded-cluster binary: %w", err)
-		}
 		return nil
 	},
 }