Fix Unknown build info in CodeFlare operator log

Author: oksanabaza

Dockerfile

@@ -5,6 +5,7 @@ WORKDIR /workspace
 # Copy the Go Modules manifests
 COPY go.mod go.mod
 COPY go.sum go.sum
+COPY ./Makefile ./Makefile
 RUN go mod download
 
 # Copy the Go sources
@@ -13,7 +14,7 @@ COPY pkg/ pkg/
 
 # Build
 USER root
-RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -tags strictfipsruntime -a -o manager main.go
+RUN CGO_ENABLED=1 GOOS=linux GOARCH=amd64 make go-build-for-image
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8
 WORKDIR /

Makefile

@@ -155,6 +155,15 @@ build: fmt vet ## Build manager binary.
 		" \
 		-o bin/manager main.go
 
+.PHONY: go-build-for-image
+go-build-for-image: fmt vet ## Build manager binary.
+	go build \
+		-ldflags " \
+			-X 'main.OperatorVersion=$(BUILD_VERSION)' \
+			-X 'main.BuildDate=$(BUILD_DATE)' \
+		" \
+		-tags strictfipsruntime -a -o manager main.go
+
 .PHONY: run
 run: manifests fmt vet ## Run a controller from your host.
 	go run ./main.go

main.go

@@ -56,12 +56,10 @@ import (
 )
 
 var (
-	scheme            = runtime.NewScheme()
-	setupLog          = ctrl.Log.WithName("setup")
-	OperatorVersion   = "UNKNOWN"
-	McadVersion       = "UNKNOWN"
-	InstaScaleVersion = "UNKNOWN"
-	BuildDate         = "UNKNOWN"
+	scheme          = runtime.NewScheme()
+	setupLog        = ctrl.Log.WithName("setup")
+	OperatorVersion = "UNKNOWN"
+	BuildDate       = "UNKNOWN"
 )
 
 func init() {
@@ -90,8 +88,6 @@ func main() {
 
 	setupLog.Info("Build info",
 		"operatorVersion", OperatorVersion,
-		"mcadVersion", McadVersion,
-		"instaScaleVersion", InstaScaleVersion,
 		"date", BuildDate,
 	)