Skip to content

CLOUDP-119550: Fixed PRODUCT_VERSION for the manager #501

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
igor-karpukhin merged 2 commits into from
Apr 20, 2022
Merged

CLOUDP-119550: Fixed PRODUCT_VERSION for the manager #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acc2342
Fixed PRODUCT_VERSION for the manager
igor-karpukhin Apr 19, 2022
a773ea9
Fixed broken clusterwide test
igor-karpukhin Apr 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.8.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:
Expand Down Expand Up @@ -85,7 +89,6 @@ e2e: run-kind ## Run e2e test. Command `make e2e label=cluster-ns` run cluster-n
./scripts/e2e_local.sh $(label) $(build)

.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

Expand Down
2 changes: 1 addition & 1 deletion cmd/manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func main() {
os.Exit(1)
}

logger.Info("starting with configuration", zap.Any("config", config))
logger.Info("starting with configuration", zap.Any("config", config), zap.Any("version", atlas.ProductVersion))

ctrl.SetLogger(zapr.NewLogger(logger))

Expand Down
2 changes: 1 addition & 1 deletion test/int/clusterwide/integration_suite_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down