From 3154cb0d6bd7189bbc828257c41f4e575bab9c29 Mon Sep 17 00:00:00 2001
From: Sid Shukla <sid.shukla@nutanix.com>
Date: Tue, 28 Nov 2023 15:39:23 +0530
Subject: [PATCH] Add last git commit hash to build flags (#332)

This ensures we have the git hash of the changes in our CI logs
so we can correlate the code changes being executed.
---
 Makefile                  |  9 ++++++---
 hack/ensure-go.sh         |  2 +-
 hack/install-go.sh        |  4 ++--
 main.go                   | 12 +++++++++---
 package/docker/Dockerfile |  2 +-
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 687e2c20da..c92c4a2e8a 100644
--- a/Makefile
+++ b/Makefile
@@ -235,7 +235,8 @@ kind-delete: ## Delete the kind cluster
 
 .PHONY: build
 build: generate fmt ## Build manager binary.
-	go build -o bin/manager main.go
+	GIT_COMMIT_HASH=`git rev-parse HEAD` && \
+	go build -ldflags "-X main.gitCommitHash=$${GIT_COMMIT_HASH}" -o bin/manager main.go
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
@@ -243,7 +244,8 @@ run: manifests generate fmt vet ## Run a controller from your host.
 
 .PHONY: docker-build
 docker-build: $(KO) ## Build docker image with the manager.
-	KO_DOCKER_REPO=ko.local $(KO) build -B --platform=${PLATFORMS} -t ${IMG_TAG} -L .
+	GIT_COMMIT_HASH=`git rev-parse HEAD` && \
+	KO_DOCKER_REPO=ko.local GOFLAGS="-ldflags=-X=main.gitCommitHash=$${GIT_COMMIT_HASH}" $(KO) build -B --platform=${PLATFORMS} -t ${IMG_TAG} -L .
 
 .PHONY: docker-push
 docker-push: $(KO) ## Push docker image with the manager.
@@ -330,7 +332,8 @@ cluster-templates: $(KUSTOMIZE) ## Generate cluster templates for all flavors
 
 .PHONY: docker-build-e2e
 docker-build-e2e: $(KO) ## Build docker image with the manager with e2e tag.
-	KO_DOCKER_REPO=ko.local $(KO) build -B --platform=${PLATFORMS_E2E} -t e2e -L .
+	GIT_COMMIT_HASH=`git rev-parse HEAD` && \
+	KO_DOCKER_REPO=ko.local GOFLAGS="-ldflags=-X=main.gitCommitHash=$${GIT_COMMIT_HASH}" $(KO) build -B --platform=${PLATFORMS_E2E} -t e2e -L .
 	docker tag ko.local/cluster-api-provider-nutanix:e2e ${IMG_REPO}:e2e
 
 .PHONY: prepare-local-clusterctl
diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh
index c06edf43cd..cbb16b0229 100755
--- a/hack/ensure-go.sh
+++ b/hack/ensure-go.sh
@@ -31,7 +31,7 @@ EOF
   local go_version
   IFS=" " read -ra go_version <<< "$(go version)"
   local minimum_go_version
-  minimum_go_version=go1.18.3
+  minimum_go_version=go1.21.4
   if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then
     cat <<EOF
 Detected go version: ${go_version[*]}.
diff --git a/hack/install-go.sh b/hack/install-go.sh
index 4a01303a21..c58be995d9 100755
--- a/hack/install-go.sh
+++ b/hack/install-go.sh
@@ -4,8 +4,8 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-wget https://go.dev/dl/go1.18.4.linux-amd64.tar.gz
-rm -rf /usr/local/go && tar -C /usr/local -xzf go1.18.4.linux-amd64.tar.gz
+wget https://go.dev/dl/go1.21.4.linux-amd64.tar.gz
+rm -rf /usr/local/go && tar -C /usr/local -xzf go1.21.4.linux-amd64.tar.gz
 export PATH=$PATH:/usr/local/go/bin
 go version
 
diff --git a/main.go b/main.go
index a1fe5e4484..17a87af985 100644
--- a/main.go
+++ b/main.go
@@ -55,6 +55,9 @@ var (
 	setupLog = ctrl.Log.WithName("setup")
 )
 
+// gitCommitHash is the git commit hash of the code that is running.
+var gitCommitHash string
+
 func init() {
 	utilruntime.Must(clientgoscheme.AddToScheme(scheme))
 
@@ -80,6 +83,7 @@ func main() {
 		probeAddr               string
 		maxConcurrentReconciles int
 	)
+
 	flag.StringVar(&metricsAddr, "metrics-bind-address", ":8080", "The address the metric endpoint binds to.")
 	flag.StringVar(&probeAddr, "health-probe-bind-address", ":8081", "The address the probe endpoint binds to.")
 	flag.BoolVar(&enableLeaderElection, "leader-elect", false,
@@ -90,6 +94,7 @@ func main() {
 		"max-concurrent-reconciles",
 		defaultMaxConcurrentReconciles,
 		"The maximum number of allowed, concurrent reconciles.")
+
 	opts := zap.Options{
 		TimeEncoder: zapcore.RFC3339TimeEncoder,
 	}
@@ -97,6 +102,7 @@ func main() {
 	flag.Parse()
 
 	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
+	setupLog.Info("Initializing Nutanix Cluster API Infrastructure Provider", "Git Hash", gitCommitHash)
 
 	mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{
 		Scheme:                 scheme,
@@ -107,11 +113,11 @@ func main() {
 		LeaderElectionID:       "f265110d.cluster.x-k8s.io",
 	})
 	if err != nil {
-		setupLog.Error(err, "unable to start manager")
+		setupLog.Error(err, "unable to create manager")
 		os.Exit(1)
 	}
 
-	// Setup the context that's going to be used in controllers and for the manager.
+	// Set up the context that's going to be used in controllers and for the manager.
 	ctx := ctrl.SetupSignalHandler()
 
 	// Create a secret informer for the Nutanix client
@@ -173,7 +179,7 @@ func main() {
 		os.Exit(1)
 	}
 
-	setupLog.Info("starting manager")
+	setupLog.Info("starting CAPX Controller Manager")
 	if err := mgr.Start(ctx); err != nil {
 		setupLog.Error(err, "problem running manager")
 		os.Exit(1)
diff --git a/package/docker/Dockerfile b/package/docker/Dockerfile
index 3b8eb5f590..419e2d76a2 100644
--- a/package/docker/Dockerfile
+++ b/package/docker/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.16 as builder
+FROM golang:1.21 as builder
 
 WORKDIR /workspace
 # Copy the Go Modules manifests