Skip to content

Commit

Permalink
Generate binaries and messaging
Browse files Browse the repository at this point in the history
Signed-off-by: Dominique Vernier <[email protected]>
  • Loading branch information
itdove committed Jun 9, 2021
1 parent 9519fb8 commit 4fa0910
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/init/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 <cluster_name>\n",
fmt.Printf("please log on spoke and run:\n%s join --hub-token %s.%s --hub-apiserver %s --cluster-name <cluster_name>\n",
helpers.GetExampleHeader(),
o.values.Hub.TokenID,
o.values.Hub.TokenSecret,
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/join/exec.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 1 addition & 1 deletion pkg/helpers/cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -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())
}
}

0 comments on commit 4fa0910

Please sign in to comment.