f

Author: sgalsaleh

.github/workflows/ci.yaml

@@ -248,7 +248,6 @@ jobs:
           path: |
             output/bin/embedded-cluster-${{ matrix.k0s_version }}-${{ matrix.type }}
             ${{ matrix.k0s_version == 'current' && matrix.type == 'install' && 'output/bin/embedded-cluster-original' || '' }}
-            ${{ matrix.k0s_version == 'current' && matrix.type == 'install' && 'output/bin/embedded-cluster-release-builder' || '' }}
 
       - name: Export k0s version
         id: export
@@ -571,6 +570,7 @@ jobs:
           export K0S_NOOP_VERSION=${{ matrix.env.K0S_NOOP_VERSION || env.K0S_NOOP_VERSION }}
           export K0S_UPGRADE_VERSION=${{ matrix.env.K0S_UPGRADE_VERSION || env.K0S_UPGRADE_VERSION }}
           export EC_UPGRADE_VERSION=${{ env.EC_UPGRADE_VERSION }}
+          export EC_BINARY_PATH="../output/bin/embedded-cluster-current-install"
           export DR_S3_ENDPOINT=https://s3.amazonaws.com
           export DR_S3_REGION=us-east-1
           export DR_S3_BUCKET=kots-testim-snapshots
@@ -684,6 +684,7 @@ jobs:
           export K0S_NOOP_VERSION=${{ matrix.env.K0S_NOOP_VERSION || env.K0S_NOOP_VERSION }}
           export K0S_UPGRADE_VERSION=${{ matrix.env.K0S_UPGRADE_VERSION || env.K0S_UPGRADE_VERSION }}
           export EC_UPGRADE_VERSION=${{ env.EC_UPGRADE_VERSION }}
+          export EC_BINARY_PATH="../output/bin/embedded-cluster-current-install"
           export REPLICATED_API_TOKEN=${{ secrets.CMX_REPLICATED_API_TOKEN }}
           export DR_S3_ENDPOINT=https://s3.amazonaws.com
           export DR_S3_REGION=us-east-1
@@ -759,6 +760,7 @@ jobs:
           export K0S_NOOP_VERSION=${{ matrix.env.K0S_NOOP_VERSION || env.K0S_NOOP_VERSION }}
           export K0S_UPGRADE_VERSION=${{ matrix.env.K0S_UPGRADE_VERSION || env.K0S_UPGRADE_VERSION }}
           export EC_UPGRADE_VERSION=${{ env.EC_UPGRADE_VERSION }}
+          export EC_BINARY_PATH="../output/bin/embedded-cluster-current-install"
           export REPLICATED_API_TOKEN=${{ secrets.CMX_REPLICATED_API_TOKEN }}
           export DR_S3_ENDPOINT=https://s3.amazonaws.com
           export DR_S3_REGION=us-east-1

.github/workflows/release-prod.yaml

@@ -391,42 +391,13 @@ jobs:
           export RELEASE_YAML_DIR=e2e/kots-release-install
           ./scripts/ci-release-app.sh
 
-  embedded-cluster-release-builder:
-    name: Build embedded-cluster-release-builder
-    runs-on: ubuntu-latest
-    needs:
-      - get-tag
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Setup go
-        uses: actions/setup-go@v5
-        with:
-          go-version-file: go.mod
-          cache-dependency-path: "**/*.sum"
-      - name: Compile embedded-cluster-release-builder
-        run: |
-          make output/bin/embedded-cluster-release-builder
-      - name: Upload embedded-cluster-release-builder artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: embedded-cluster-release-builder
-          path: |
-            output/bin/embedded-cluster-release-builder
-
   download-current:
     name: Download the current release binary
     runs-on: ubuntu-latest
     needs:
       - release-app
       - get-tag
-      - embedded-cluster-release-builder
     steps:
-      - name: Download embedded-cluster-release-builder
-        uses: actions/download-artifact@v4
-        with:
-          name: embedded-cluster-release-builder
-          path: output/bin
       - name: Download current binary
         env:
           # staging ci license id
@@ -451,7 +422,6 @@ jobs:
           path: |
             output/bin/embedded-cluster
             output/bin/embedded-cluster-original
-            output/bin/embedded-cluster-release-builder
 
   # e2e-docker runs the e2e tests inside a docker container rather than a full VM
   e2e-docker:

e2e/cluster/docker/cluster.go

@@ -23,7 +23,6 @@ type ClusterInput struct {
 	Distro                 string
 	LicensePath            string
 	ECBinaryPath           string
-	ECReleaseBuilderPath   string
 	K0sDir                 string
 	SupportBundleNodeIndex int
 }
@@ -61,10 +60,6 @@ func NewNode(in *ClusterInput, name string) *Container {
 		in.T.Logf("using embedded cluster binary %s", in.ECBinaryPath)
 		c = c.WithECBinary(in.ECBinaryPath)
 	}
-	if in.ECReleaseBuilderPath != "" {
-		in.T.Logf("using embedded cluster release builder %s", in.ECReleaseBuilderPath)
-		c = c.WithECReleaseBuilder(in.ECReleaseBuilderPath)
-	}
 	if in.LicensePath != "" {
 		in.T.Logf("using license %s", in.LicensePath)
 		c = c.WithLicense(in.LicensePath)

e2e/cluster/docker/container.go

@@ -56,26 +56,6 @@ func (c *Container) GetECBinaryPath() string {
 	return "/usr/local/bin/embedded-cluster"
 }
 
-func (c *Container) WithECReleaseBuilder(path string) *Container {
-	path, err := filepath.Abs(path)
-	if err != nil {
-		c.t.Fatalf("failed to get absolute path to embedded-cluster release builder: %v", err)
-	}
-	_, err = os.Stat(path)
-	if err != nil {
-		c.t.Fatalf("failed to find embedded-cluster release builder: %v", err)
-	}
-	err = os.Chmod(path, 0755)
-	if err != nil {
-		c.t.Fatalf("failed to chmod embedded-cluster binary: %v", err)
-	}
-	return c.WithVolume(fmt.Sprintf("%s:%s", path, c.GetECReleaseBuilderPath()))
-}
-
-func (c *Container) GetECReleaseBuilderPath() string {
-	return "/usr/local/bin/embedded-cluster-release-builder"
-}
-
 func (c *Container) WithLicense(path string) *Container {
 	path, err := filepath.Abs(path)
 	if err != nil {

e2e/cluster/lxd/cluster.go

@@ -56,22 +56,21 @@ func (n *NoopCloser) Close() error {
 // ClusterInput are the options passed in to the cluster creation plus some data
 // for internal consumption only.
 type ClusterInput struct {
-	Nodes                             int
-	CreateRegularUser                 bool
-	LicensePath                       string
-	EmbeddedClusterPath               string
-	EmbeddedClusterReleaseBuilderPath string // used to replace the release in the binary
-	AirgapInstallBundlePath           string
-	AirgapUpgradeBundlePath           string
-	AirgapUpgrade2BundlePath          string
-	Image                             string
-	network                           string
-	T                                 *testing.T
-	WithProxy                         bool
-	id                                string
-	AdditionalFiles                   []File
-	SupportBundleNodeIndex            int
-	LowercaseNodeNames                bool
+	Nodes                    int
+	CreateRegularUser        bool
+	LicensePath              string
+	ECBinaryPath             string
+	AirgapInstallBundlePath  string
+	AirgapUpgradeBundlePath  string
+	AirgapUpgrade2BundlePath string
+	Image                    string
+	network                  string
+	T                        *testing.T
+	WithProxy                bool
+	id                       string
+	AdditionalFiles          []File
+	SupportBundleNodeIndex   int
+	LowercaseNodeNames       bool
 }
 
 // File holds information about a file that must be uploaded to a node.
@@ -475,15 +474,10 @@ func CopyFilesToNode(in *ClusterInput, node string) {
 			Mode:       0644,
 		},
 		{
-			SourcePath: in.EmbeddedClusterPath,
+			SourcePath: in.ECBinaryPath,
 			DestPath:   "/usr/local/bin/embedded-cluster",
 			Mode:       0755,
 		},
-		{
-			SourcePath: in.EmbeddedClusterReleaseBuilderPath,
-			DestPath:   "/usr/local/bin/embedded-cluster-release-builder",
-			Mode:       0755,
-		},
 		{
 			SourcePath: in.AirgapInstallBundlePath,
 			DestPath:   "/assets/ec-release.tgz",

e2e/host-support-bundle_test.go

@@ -13,14 +13,15 @@ func TestHostCollectSupportBundleInCluster(t *testing.T) {
 
 	RequireEnvVars(t, []string{
 		"APP_INSTALL_VERSION",
+		"EC_BINARY_PATH",
 	})
 
 	tc := docker.NewCluster(&docker.ClusterInput{
 		T:            t,
 		Nodes:        1,
 		Distro:       "debian-bookworm",
 		LicensePath:  "licenses/license.yaml",
-		ECBinaryPath: "../output/bin/embedded-cluster",
+		ECBinaryPath: os.Getenv("EC_BINARY_PATH"),
 	})
 	defer tc.Cleanup()