f

Makefile

@@ -26,9 +26,9 @@ LD_FLAGS = \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.Version=$(VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.TroubleshootVersion=$(TROUBLESHOOT_VERSION) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/versions.LocalArtifactMirrorImage=$(LOCAL_ARTIFACT_MIRROR_IMAGE) \
-	-X github.com/replicatedhq/embedded-cluster/cmd/embedded-cluster/main.K0sBinaryURLOverride=$(METADATA_K0S_BINARY_URL_OVERRIDE) \
-	-X github.com/replicatedhq/embedded-cluster/cmd/embedded-cluster/main.KOTSBinaryURLOverride=$(METADATA_KOTS_BINARY_URL_OVERRIDE) \
-	-X github.com/replicatedhq/embedded-cluster/cmd/embedded-cluster/main.OperatorBinaryURLOverride=$(METADATA_OPERATOR_BINARY_URL_OVERRIDE) \
+	-X github.com/replicatedhq/embedded-cluster/pkg/versions.K0sBinaryURLOverride=$(METADATA_K0S_BINARY_URL_OVERRIDE) \
+	-X github.com/replicatedhq/embedded-cluster/pkg/versions.KOTSBinaryURLOverride=$(METADATA_KOTS_BINARY_URL_OVERRIDE) \
+	-X github.com/replicatedhq/embedded-cluster/pkg/versions.OperatorBinaryURLOverride=$(METADATA_OPERATOR_BINARY_URL_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.ChartRepoOverride=$(ADMIN_CONSOLE_CHART_REPO_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.KurlProxyImageOverride=$(ADMIN_CONSOLE_KURL_PROXY_IMAGE_OVERRIDE) \
 	-X github.com/replicatedhq/embedded-cluster/pkg/addons/adminconsole.KotsVersion=$(KOTS_VERSION) \
@@ -97,7 +97,7 @@ output/bins/kubectl-preflight-%:
 .PHONY: pkg/goods/bins/local-artifact-mirror
 pkg/goods/bins/local-artifact-mirror:
 	mkdir -p pkg/goods/bins
-	$(MAKE) -C local-artifact-mirror build GOOS=$(OS) GOARCH=$(ARCH)
+	$(MAKE) -C local-artifact-mirror build OS=$(OS) ARCH=$(ARCH)
 	cp local-artifact-mirror/bin/local-artifact-mirror-$(OS)-$(ARCH) $@
 	touch $@
 

cmd/embedded-cluster/metadata.go

@@ -21,18 +21,6 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/versions"
 )
 
-var (
-	// K0sBinaryURLOverride is used to override the k0s binary url and is overridden using LD_FLAGS
-	// in the Makefile
-	K0sBinaryURLOverride string
-	// KOTSBinaryURLOverride is used to override the KOTS binary url and is overridden using
-	// LD_FLAGS in the Makefile
-	KOTSBinaryURLOverride string
-	// OperatorBinaryURLOverride is used to override the Operator binary url and is overridden
-	// using LD_FLAGS in the Makefile
-	OperatorBinaryURLOverride string
-)
-
 var metadataCommand = &cli.Command{
 	Name:   "metadata",
 	Usage:  "Print metadata about this release",
@@ -87,14 +75,14 @@ func gatherVersionMetadata(k0sCfg *k0sconfig.ClusterConfig) (*types.ReleaseMetad
 		"operator":                    fmt.Sprintf("operator-binaries/%s.tar.gz", embeddedclusteroperator.Metadata.Version),
 		"local-artifact-mirror-image": versions.LocalArtifactMirrorImage,
 	}
-	if K0sBinaryURLOverride != "" {
-		artifacts["k0s"] = K0sBinaryURLOverride
+	if versions.K0sBinaryURLOverride != "" {
+		artifacts["k0s"] = versions.K0sBinaryURLOverride
 	}
-	if KOTSBinaryURLOverride != "" {
-		artifacts["kots"] = KOTSBinaryURLOverride
+	if versions.KOTSBinaryURLOverride != "" {
+		artifacts["kots"] = versions.KOTSBinaryURLOverride
 	}
-	if OperatorBinaryURLOverride != "" {
-		artifacts["operator"] = OperatorBinaryURLOverride
+	if versions.OperatorBinaryURLOverride != "" {
+		artifacts["operator"] = versions.OperatorBinaryURLOverride
 	}
 
 	meta := types.ReleaseMetadata{

pkg/versions/versions.go

@@ -13,4 +13,14 @@ var (
 	// LocalArtifactMirrorImage holds a reference to where the lam image for
 	// this version of embedded-cluster is stored. Set at compile time.
 	LocalArtifactMirrorImage = ""
+
+	// K0sBinaryURLOverride is used to override the k0s binary url and is set at compile time using
+	// LD_FLAGS in the Makefile
+	K0sBinaryURLOverride string
+	// KOTSBinaryURLOverride is used to override the KOTS binary url and is set at compile time
+	// using LD_FLAGS in the Makefile
+	KOTSBinaryURLOverride string
+	// OperatorBinaryURLOverride is used to override the Operator binary url and is set at compile
+	// time using LD_FLAGS in the Makefile
+	OperatorBinaryURLOverride string
 )

scripts/dev-build.sh

@@ -58,9 +58,9 @@ function clean() {
 }
 
 function main() {
+    clean
     init_vars
     build
-    clean
 }
 
 main "$@"