Merge pull request #4576 from kubernetes-sigs/revert-4481-make-go-ins…

…tall-able

🐛 Revert "Make kubebuilder go install-able"

Makefile

@@ -46,15 +46,15 @@ help: ## Display this help
 ##@ Build
 
 LD_FLAGS=-ldflags " \
-    -X cmd.kubeBuilderVersion=$(shell git describe --tags --dirty --broken) \
-    -X cmd.goos=$(shell go env GOOS) \
-    -X cmd.goarch=$(shell go env GOARCH) \
-    -X cmd.gitCommit=$(shell git rev-parse HEAD) \
-    -X cmd.buildDate=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \
+    -X main.kubeBuilderVersion=$(shell git describe --tags --dirty --broken) \
+    -X main.goos=$(shell go env GOOS) \
+    -X main.goarch=$(shell go env GOARCH) \
+    -X main.gitCommit=$(shell git rev-parse HEAD) \
+    -X main.buildDate=$(shell date -u +'%Y-%m-%dT%H:%M:%SZ') \
     "
 .PHONY: build
 build: ## Build the project locally
-	go build $(LD_FLAGS) -o bin/kubebuilder
+	go build $(LD_FLAGS) -o bin/kubebuilder ./cmd
 
 .PHONY: install
 install: build ## Build and install the binary with the current source code. Use it to test your changes locally.

build/.goreleaser.yml

@@ -29,15 +29,16 @@ before:
 # Build a binary for each target in targets.
 builds:
   - id: kubebuilder
+    main: ./cmd
     binary: kubebuilder
     mod_timestamp: "{{ .CommitTimestamp }}"
     ldflags:
-      - -X cmd.kubeBuilderVersion={{ .Version }}
-      - -X cmd.goos={{ .Os }}
-      - -X cmd.goarch={{ .Arch }}
-      - -X cmd.gitCommit={{ .Commit }}
-      - -X cmd.buildDate={{ .Date }}
-      - -X cmd.kubernetesVendorVersion={{ .Env.KUBERNETES_VERSION }}
+      - -X main.kubeBuilderVersion={{ .Version }}
+      - -X main.goos={{ .Os }}
+      - -X main.goarch={{ .Arch }}
+      - -X main.gitCommit={{ .Commit }}
+      - -X main.buildDate={{ .Date }}
+      - -X main.kubernetesVendorVersion={{ .Env.KUBERNETES_VERSION }}
     targets:
       - linux_amd64
       - linux_arm64

cmd/cmd.go → cmd/main.go

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package main
 
 import (
 	"github.com/sirupsen/logrus"
@@ -36,8 +36,7 @@ func init() {
 	logrus.SetFormatter(&logrus.TextFormatter{DisableTimestamp: true})
 }
 
-// Run bootstraps & runs the CLI
-func Run() {
+func main() {
 	// Bundle plugin which built the golang projects scaffold with base.go/v4 and kustomize/v2 plugins
 	gov4Bundle, _ := plugin.NewBundleWithOptions(plugin.WithName(golang.DefaultNameQualifier),
 		plugin.WithVersion(plugin.Version{Number: 4}),

cmd/version.go

@@ -14,22 +14,19 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package cmd
+package main
 
 import (
 	"fmt"
-	"runtime/debug"
 )
 
-const unknown = "unknown"
-
 // var needs to be used instead of const as ldflags is used to fill this
 // information in the release process
 var (
-	kubeBuilderVersion      = unknown
-	kubernetesVendorVersion = unknown
-	goos                    = unknown
-	goarch                  = unknown
+	kubeBuilderVersion      = "unknown"
+	kubernetesVendorVersion = "unknown"
+	goos                    = "unknown"
+	goarch                  = "unknown"
 	gitCommit               = "$Format:%H$" // sha1 from git, output of $(git rev-parse HEAD)
 
 	buildDate = "1970-01-01T00:00:00Z" // build date in ISO8601 format, output of $(date -u +'%Y-%m-%dT%H:%M:%SZ')
@@ -47,12 +44,6 @@ type version struct {
 
 // versionString returns the CLI version
 func versionString() string {
-	if kubeBuilderVersion == unknown {
-		if info, ok := debug.ReadBuildInfo(); ok && info.Main.Version != "" {
-			kubeBuilderVersion = info.Main.Version
-		}
-	}
-
 	return fmt.Sprintf("Version: %#v", version{
 		kubeBuilderVersion,
 		kubernetesVendorVersion,

test/common.sh

@@ -109,7 +109,7 @@ SKIP_FETCH_TOOLS=${SKIP_FETCH_TOOLS:-""}
 function build_kb {
   header_text "Building kubebuilder"
 
-  go build -o "${kb_root_dir}/bin/kubebuilder"
+  go build -o "${kb_root_dir}/bin/kubebuilder" ./cmd
   kb="${kb_root_dir}/bin/kubebuilder"
 }