diff --git a/.gitignore b/.gitignore index 73571d225..5cdf315b3 100644 --- a/.gitignore +++ b/.gitignore @@ -13,6 +13,7 @@ test/unit/coverage test/unit/tmp test/functional/tmp test/out +/bin # Output of the go coverage tool, specifically when used with LiteIDE *.out diff --git a/Makefile b/Makefile index 7c4fec6a5..5242a4371 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,16 @@ deps: build: go install ./cmd/clusteradm.go +.PHONY: +build-bin: + @mkdir -p bin + GOOS=darwin GOARCH=amd64 go build -o bin/clusteradm_darwin_amd64 ./cmd/clusteradm.go + GOOS=linux GOARCH=amd64 go build -o bin/clusteradm_linux_amd64 ./cmd/clusteradm.go + GOOS=linux GOARCH=arm64 go build -o bin/clusteradm_linux_arm64 ./cmd/clusteradm.go + GOOS=linux GOARCH=ppc64le go build -o bin/clusteradm_linux_ppc64le ./cmd/clusteradm.go + GOOS=linux GOARCH=s390x go build -o bin/clusteradm_linux_s390x ./cmd/clusteradm.go + GOOS=windows GOARCH=amd64 go build -o bin/clusteradm_windows_amd64.exe ./cmd/clusteradm.go + .PHONY: install install: build diff --git a/pkg/cmd/init/exec.go b/pkg/cmd/init/exec.go index 46b416b48..292ddb4b3 100644 --- a/pkg/cmd/init/exec.go +++ b/pkg/cmd/init/exec.go @@ -98,7 +98,7 @@ func (o *Options) run() error { } output = append(output, out...) - fmt.Printf("login into the cluster and run: %s join --hub-token %s.%s --hub-apiserver %s --cluster-name \n", + fmt.Printf("please log on spoke and run:\n%s join --hub-token %s.%s --hub-apiserver %s --cluster-name \n", helpers.GetExampleHeader(), o.values.Hub.TokenID, o.values.Hub.TokenSecret, diff --git a/pkg/cmd/join/exec.go b/pkg/cmd/join/exec.go index 7b025b7d5..b69cc6464 100644 --- a/pkg/cmd/join/exec.go +++ b/pkg/cmd/join/exec.go @@ -129,7 +129,7 @@ func (o *Options) run() error { return err } output = append(output, out...) - fmt.Printf("login back onto the hub and run: %s accept --clusters %s\n", helpers.GetExampleHeader(), o.values.ClusterName) + fmt.Printf("please wait a few minutes then log on to hub and accept by running:\n%s accept --clusters %s\n", helpers.GetExampleHeader(), o.values.ClusterName) return apply.WriteOutput(o.outputFile, output) diff --git a/pkg/helpers/cmd.go b/pkg/helpers/cmd.go index 86ab335b6..517ceeee2 100644 --- a/pkg/helpers/cmd.go +++ b/pkg/helpers/cmd.go @@ -32,6 +32,6 @@ func UsageTempate(cmd *cobra.Command, reader asset.ScenarioReader, valuesTemplat func DryRunMessage(dryRun bool) { if dryRun { - fmt.Printf("%s is running in dry-run mode", GetExampleHeader()) + fmt.Printf("%s is running in dry-run mode\n", GetExampleHeader()) } }