Remove antctl-bin dir and use bin for antctl binaries builds

Signed-off-by: Weiqiang TANG <[email protected]>

Makefile

@@ -4,9 +4,8 @@ GO              ?= go
 LDFLAGS         :=
 GOFLAGS         :=
 BINDIR          := $(CURDIR)/bin
-ANTCTL_BINDIR   := $(CURDIR)/antctl-bin
 GO_FILES        := $(shell find . -type d -name '.cache' -prune -o -type f -name '*.go' -print)
-GOPATH          ?= $$(go env GOPATH)
+GOPATH          ?= $$($(GO) env GOPATH)
 DOCKER_CACHE    := $(CURDIR)/.cache
 
 .PHONY: all
@@ -80,11 +79,11 @@ docker-tidy: $(DOCKER_CACHE)
 # TODO: strip binary when building realses
 ANTCTL_BINARIES := antctl-darwin antctl-linux antctl-windows
 $(ANTCTL_BINARIES): antctl-%:
-	@GOOS=$* $(GO) build -o $(ANTCTL_BINDIR)/$@ $(GOFLAGS) -ldflags '$(LDFLAGS)' github.com/vmware-tanzu/antrea/cmd/antctl
+	@GOOS=$* $(GO) build -o $(BINDIR)/$@ $(GOFLAGS) -ldflags '$(LDFLAGS)' github.com/vmware-tanzu/antrea/cmd/antctl
 	@if [[ $@ != *windows ]]; then \
-	  chmod 0755 $(ANTCTL_BINDIR)/$@; \
+	  chmod 0755 $(BINDIR)/$@; \
 	else \
-	  mv $(ANTCTL_BINDIR)/$@ $(ANTCTL_BINDIR)/$@.exe; \
+	  mv $(BINDIR)/$@ $(BINDIR)/$@.exe; \
 	fi
 
 .PHONY: antctl
@@ -139,7 +138,6 @@ lint: .linter
 .PHONY: clean
 clean:
 	@rm -rf $(BINDIR)
-	@rm -rf $(ANTCTL_BINDIR)
 	@rm -rf $(DOCKER_CACHE)
 	@rm -f .mockgen .protoc
 

build/yamls/antrea.yml

@@ -136,8 +136,8 @@ rules:
   verbs:
   - create
 - nonResourceURLs:
-    - /apis/antctl.antrea.tanzu.vmware.com/v1
-    - /apis/antctl.antrea.tanzu.vmware.com/v1/*
+  - /apis/antctl.antrea.tanzu.vmware.com/v1
+  - /apis/antctl.antrea.tanzu.vmware.com/v1/*
   verbs:
   - get
 ---

cmd/antctl/main.go

@@ -33,7 +33,7 @@ var commandName = path.Base(os.Args[0])
 var rootCmd = &cobra.Command{
 	Use:   commandName,
 	Short: commandName + " is the command line tool for Antrea",
-	Long:  commandName + " is the command line tool for Antrea that supports showing runtime information of Controller or Agent.",
+	Long:  commandName + " is the command line tool for Antrea that supports showing runtime information of ${component}",
 }
 
 func init() {