Fix Unknown build info in CodeFlare operator log

Author: oksanabaza

.github/workflows/operator-image.yml

@@ -32,8 +32,8 @@ jobs:
     - name: Image Build
       run: |
         make build
-        make image-build -e IMG=quay.io/project-codeflare/codeflare-operator:dev
-        make image-push -e IMG=quay.io/project-codeflare/codeflare-operator:dev
+        make image-build -e IMG=quay.io/rh-ee-obazylie/codeflare-operator:test1
+        make image-push -e IMG=quay.io/rh-ee-obazylie/codeflare-operator:test1
 
     - name: Logout from Quay.io
       if: always() && steps.podman-login-quay.outcome == 'success'

Dockerfile

@@ -13,11 +13,11 @@ 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 docker-build
 
 FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8
 WORKDIR /
 COPY --from=builder /workspace/manager .
 
 USER 65532:65532
-ENTRYPOINT ["/manager"]
+ENTRYPOINT ["/manager"]

Makefile

@@ -155,6 +155,15 @@ build: fmt vet ## Build manager binary.
 		" \
 		-o bin/manager main.go
 
+.PHONY: docker-build
+docker-build: 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
@@ -376,4 +385,4 @@ image-mnist-job-test-build: ## Build container image with the MNIST job.
 
 .PHONY: image-mnist-job-test-push
 image-mnist-job-test-push: image-mnist-job-test-build ## Push container image with the MNIST job.
-	podman push ${MNIST_JOB_TEST_IMG}
+	podman push ${MNIST_JOB_TEST_IMG}

config/manager/params.env

@@ -1 +1,2 @@
-codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.3.0
+codeflare-operator-controller-image=quay.io/opendatahub/codeflare-operator:v1.3.1
+namespace=opendatahub

main.go

@@ -56,12 +56,11 @@ 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"
+	JobTestVersion  = "UNKNOWN"
 )
 
 func init() {
@@ -90,8 +89,6 @@ func main() {
 
 	setupLog.Info("Build info",
 		"operatorVersion", OperatorVersion,
-		"mcadVersion", McadVersion,
-		"instaScaleVersion", InstaScaleVersion,
 		"date", BuildDate,
 	)