move the embedded-cluster binary to /var/lib/embedded-cluster/bin after materialize (#485)

* move the embedded-cluster binary to /var/lib/embedded-cluster/bin after materialize

* use actual embedded-cluster-kinds release

* include the binary name in the installation kind upon initial install

* update embedded-cluster-operator chart version

* empty

Author: laverya

Makefile

@@ -9,7 +9,7 @@ ADMIN_CONSOLE_IMAGE_OVERRIDE =
 ADMIN_CONSOLE_MIGRATIONS_IMAGE_OVERRIDE =
 EMBEDDED_OPERATOR_CHART_URL = oci://registry.replicated.com/library
 EMBEDDED_OPERATOR_CHART_NAME = embedded-cluster-operator
-EMBEDDED_OPERATOR_CHART_VERSION = 0.26.1
+EMBEDDED_OPERATOR_CHART_VERSION = 0.27.0
 EMBEDDED_OPERATOR_UTILS_IMAGE = busybox:1.36.1
 OPENEBS_CHART_URL = https://openebs.github.io/charts
 OPENEBS_CHART_NAME = openebs/openebs

cmd/local-artifact-mirror/pull.go

@@ -189,6 +189,15 @@ 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
 	},
 }

go.mod

@@ -14,7 +14,7 @@ require (
 	github.com/jedib0t/go-pretty v4.3.0+incompatible
 	github.com/k0sproject/dig v0.2.0
 	github.com/k0sproject/k0s v1.29.3-0.20240220215935-6a63dc9024ce
-	github.com/replicatedhq/embedded-cluster-kinds v1.1.1
+	github.com/replicatedhq/embedded-cluster-kinds v1.1.2
 	github.com/replicatedhq/embedded-cluster-operator v0.26.0
 	github.com/replicatedhq/embedded-cluster-utils v1.0.0
 	github.com/replicatedhq/kotskinds v0.0.0-20230724164735-f83482cc9cfe

go.sum

@@ -241,8 +241,8 @@ github.com/prometheus/common v0.45.0 h1:2BGz0eBc2hdMDLnO/8n0jeB3oPrt2D08CekT0lne
 github.com/prometheus/common v0.45.0/go.mod h1:YJmSTw9BoKxJplESWWxlbyttQR4uaEcGyv9MZjVOJsY=
 github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
 github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
-github.com/replicatedhq/embedded-cluster-kinds v1.1.1 h1:300bVpCBHtZ9acJgEHL3/S4CapvxCRfcSwg/adMNWW8=
-github.com/replicatedhq/embedded-cluster-kinds v1.1.1/go.mod h1:LheSDOgMngMRAbwAj0sVZUVv2ciKIVR2bYTMeOBGwlg=
+github.com/replicatedhq/embedded-cluster-kinds v1.1.2 h1:2ITzcUzh5uh0fsnfZsVHvkwS6XC6NGBbHf99gLgZM9M=
+github.com/replicatedhq/embedded-cluster-kinds v1.1.2/go.mod h1:LheSDOgMngMRAbwAj0sVZUVv2ciKIVR2bYTMeOBGwlg=
 github.com/replicatedhq/embedded-cluster-operator v0.26.0 h1:ys7qq054KdgpfQ+NmXIDzp3xTNrZdw4NmRyGONGNypI=
 github.com/replicatedhq/embedded-cluster-operator v0.26.0/go.mod h1:kP/gI2X/fhgTKSRBC52077RPYmHOpvwezChnM26nvDo=
 github.com/replicatedhq/embedded-cluster-utils v1.0.0 h1:Axdni1nYfl5zeOP9g5U79yvN8cRdClyU6hz0wV1Hmdc=

pkg/addons/embeddedclusteroperator/embeddedclusteroperator.go

@@ -183,6 +183,7 @@ func (e *EmbeddedClusterOperator) Outro(ctx context.Context, cli client.Client)
 			AirGap:                    e.airgap,
 			Config:                    cfgspec,
 			EndUserK0sConfigOverrides: euOverrides,
+			BinaryName:                defaults.BinaryName(),
 		},
 	}
 	embeddedclusterv1beta1.AddToScheme(cli.Scheme())