Add endpoint that returns the EC binary from the EC data directory (#5290)

* Add endpoint that returns the EC binary from the EC data directory

Author: sgalsaleh

.github/actions/copy-assets/Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.24 as builder
+FROM golang:1.24.2 as builder
 WORKDIR /action
 COPY . /action
 

dev/dockerfiles/kotsadm/Dockerfile.local

@@ -1,8 +1,8 @@
-FROM golang:1.24-alpine AS dlv-builder
+FROM golang:1.24.2-alpine AS dlv-builder
 
 RUN go install github.com/go-delve/delve/cmd/[email protected]
 
-FROM golang:1.24-alpine
+FROM golang:1.24.2-alpine
 
 RUN apk add --no-cache ca-certificates s3cmd curl git make bash
 

dev/dockerfiles/kurl-proxy/Dockerfile.local

@@ -1,4 +1,4 @@
-FROM golang:1.24-alpine
+FROM golang:1.24.2-alpine
 
 RUN apk add --no-cache ca-certificates curl git make bash
 

dev/scripts/common.sh

@@ -27,7 +27,7 @@ function populate() {
         -e GOCACHE=/replicatedhq/kots/dev/.gocache \
         -e GOMODCACHE=/replicatedhq/kots/dev/.gomodcache \
         -w /replicatedhq/kots \
-        golang:1.24-alpine \
+        golang:1.24.2-alpine \
         /bin/sh -c "apk add make bash git && make kots build"
       ;;
     "kotsadm-web")
@@ -44,7 +44,7 @@ function populate() {
         -e GOCACHE=/replicatedhq/kots/dev/.gocache \
         -e GOMODCACHE=/replicatedhq/kots/dev/.gomodcache \
         -w /replicatedhq/kots/kurl_proxy \
-        golang:1.24-alpine \
+        golang:1.24.2-alpine \
         /bin/sh -c "apk add make bash git && make build"
       ;;
   esac

e2e/playwright/tests/@target-kots-version-online/test.spec.ts

@@ -52,7 +52,7 @@ const validateOnlineUpdateRestrictive = async (page: Page, expect: Expect) => {
   await onlineCheckForUpdates(page, expect);
 
   const availableUpdateCard = page.getByTestId("available-updates-card");
-  await expect(availableUpdateCard).toContainText(constants.VENDOR_RESTRICTIVE_RELEASE_SEMVER);
+  await expect(availableUpdateCard).toContainText(constants.VENDOR_RESTRICTIVE_RELEASE_SEMVER, { timeout: 30 * 1000 }); // 30 seconds
 
   await expect(footer).not.toContainText(`${constants.PERMISSIVE_TARGET_KOTS_VERSION} available.`);
 };

go.mod

@@ -1,6 +1,6 @@
 module github.com/replicatedhq/kots
 
-go 1.24.1
+go 1.24.2
 
 require (
 	cloud.google.com/go/storage v1.45.0
@@ -250,7 +250,7 @@ require (
 	github.com/k0sproject/k0s v1.30.10-0.20250117153350-dcf3c22bb568 // indirect
 	github.com/kevinburke/ssh_config v1.2.0 // indirect
 	github.com/klauspost/compress v1.17.11 // indirect
-	github.com/klauspost/pgzip v1.2.6 // indirect
+	github.com/klauspost/pgzip v1.2.6
 	github.com/lann/builder v0.0.0-20180802200727-47ae307949d0 // indirect
 	github.com/lann/ps v0.0.0-20150810152359-62de8c46ede0 // indirect
 	github.com/letsencrypt/boulder v0.0.0-20240620165639-de9c06129bec // indirect

kurl_proxy/go.mod

@@ -1,6 +1,6 @@
 module github.com/replicatedhq/kots/kurl_proxy
 
-go 1.24.0
+go 1.24.2
 
 require (
 	github.com/gin-gonic/gin v1.10.0

pkg/handlers/embedded_cluster_artifacts.go

@@ -0,0 +1,116 @@
+package handlers
+
+import (
+	"archive/tar"
+	"fmt"
+	"io"
+	"net/http"
+	"os"
+	"path/filepath"
+
+	"github.com/klauspost/pgzip"
+	"github.com/pkg/errors"
+	"github.com/replicatedhq/kots/pkg/embeddedcluster"
+	"github.com/replicatedhq/kots/pkg/logger"
+	"github.com/replicatedhq/kots/pkg/util"
+)
+
+// GetEmbeddedClusterBinary returns the embedded cluster binary as a .tgz file
+func (h *Handler) GetEmbeddedClusterBinary(w http.ResponseWriter, r *http.Request) {
+	if !util.IsEmbeddedCluster() {
+		logger.Error(errors.New("not an embedded cluster"))
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
+	// Get kubeclient
+	kbClient, err := h.GetKubeClient(r.Context())
+	if err != nil {
+		logger.Error(errors.Wrap(err, "failed to get kubeclient"))
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// Get current installation
+	installation, err := embeddedcluster.GetCurrentInstallation(r.Context(), kbClient)
+	if err != nil {
+		logger.Error(errors.Wrap(err, "failed to get current installation"))
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// Get data directory path from runtime config
+	dataDir := ""
+	if installation.Spec.RuntimeConfig != nil {
+		dataDir = installation.Spec.RuntimeConfig.DataDir
+	}
+	if dataDir == "" {
+		logger.Error(errors.New("data directory not found in runtime config"))
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// Get binary name from installation
+	binaryName := installation.Spec.BinaryName
+	if binaryName == "" {
+		logger.Error(errors.New("binary name not found in installation"))
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// Path to EC binary
+	binaryPath := filepath.Join(dataDir, "bin", binaryName)
+
+	// Check if binary exists
+	binaryStat, err := os.Stat(binaryPath)
+	if os.IsNotExist(err) {
+		logger.Error(errors.Wrap(err, "binary file not found"))
+		w.WriteHeader(http.StatusNotFound)
+		return
+	} else if err != nil {
+		logger.Error(errors.Wrap(err, "failed to stat binary file"))
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+
+	// Open binary file
+	binaryFile, err := os.Open(binaryPath)
+	if err != nil {
+		logger.Error(errors.Wrap(err, "failed to open binary file"))
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	defer binaryFile.Close()
+
+	// Set response headers for the .tgz file
+	filename := fmt.Sprintf("%s.tgz", binaryName)
+	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%s", filename))
+	w.Header().Set("Content-Type", "application/gzip")
+
+	// Create pgzip writer
+	gzipWriter := pgzip.NewWriter(w)
+	defer gzipWriter.Close()
+
+	// Create tar writer
+	tarWriter := tar.NewWriter(gzipWriter)
+	defer tarWriter.Close()
+
+	// Add binary file to tar archive
+	header := &tar.Header{
+		Name:    binaryName,
+		Mode:    0755, // Executable permission
+		Size:    binaryStat.Size(),
+		ModTime: binaryStat.ModTime(),
+	}
+
+	if err := tarWriter.WriteHeader(header); err != nil {
+		logger.Error(errors.Wrap(err, "failed to write tar header"))
+		return
+	}
+
+	// Copy binary content to tar archive
+	if _, err := io.Copy(tarWriter, binaryFile); err != nil {
+		logger.Error(errors.Wrap(err, "failed to write binary to tar archive"))
+		return
+	}
+}

pkg/handlers/handlers.go

@@ -387,6 +387,9 @@ func RegisterUnauthenticatedRoutes(handler *Handler, kotsStore store.Store, debu
 
 	// This handler requires a valid token in the query
 	loggingRouter.Path("/api/v1/embedded-cluster/join").Methods("GET").HandlerFunc(handler.GetEmbeddedClusterNodeJoinCommand)
+
+	// This endpoint returns the embedded cluster binary as a .tgz file
+	loggingRouter.Path("/api/v1/embedded-cluster/binary").Methods("GET").HandlerFunc(handler.GetEmbeddedClusterBinary)
 }
 
 func StreamJSON(c *gwebsocket.Conn, payload interface{}) {