CLOUDP-119550: Fixed PRODUCT_VERSION for the manager (#501)

Fixed PRODUCT_VERSION for the manager

Author: igor-karpukhin

Makefile

@@ -8,6 +8,10 @@ SHELL := /usr/bin/env bash
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 VERSION ?= 0.5.0
 
+ifndef PRODUCT_VERSION
+PRODUCT_VERSION := $(shell git describe --tags --dirty --broken)
+endif
+
 # CHANNELS define the bundle channels used in the bundle.
 # Add a new line here if you would like to change its default config. (E.g CHANNELS = "preview,fast,stable")
 # To re-generate a bundle for other specific channels without changing the standard setup, you can:
@@ -85,7 +89,6 @@ e2e: run-kind ## Run e2e test. Command `make e2e focus=cluster-ns` run cluster-n
 	./scripts/e2e_local.sh $(focus)
 
 .PHONY: manager
-manager: export PRODUCT_VERSION=$(shell git describe --tags --dirty --broken)
 manager: generate fmt vet ## Build manager binary
 	go build -o bin/manager -ldflags="-X main.version=$(PRODUCT_VERSION)" cmd/manager/main.go
 

cmd/manager/main.go

@@ -73,7 +73,7 @@ func main() {
 	// logging
 	logger := ctrzap.NewRaw(ctrzap.UseDevMode(true), ctrzap.StacktraceLevel(zap.ErrorLevel))
 
-	config := parseConfiguration(logger.Sugar())
+	config := parseConfiguration(logger.Sugar(), zap.Any("version", atlas.ProductVersion))
 
 	ctrl.SetLogger(zapr.NewLogger(logger))
 

test/int/clusterwide/integration_suite_test.go

@@ -177,7 +177,7 @@ func prepareAtlasClient() (*mongodbatlas.Client, atlas.Connection) {
 	withDigest := httputil.Digest(publicKey, privateKey)
 	httpClient, err := httputil.DecorateClient(&http.Client{Transport: http.DefaultTransport}, withDigest)
 	Expect(err).ToNot(HaveOccurred())
-	aClient, err := mongodbatlas.New(httpClient, mongodbatlas.SetBaseURL(atlasDomain+"/api/atlas/v1.0/"))
+	aClient, err := mongodbatlas.New(httpClient, mongodbatlas.SetBaseURL(atlasDomain))
 	Expect(err).ToNot(HaveOccurred())
 
 	return aClient, atlas.Connection{