Skip to content
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

Jump to bottom

CLOUDP-277877: Use NEXT_VERSION on make runs #1855

Merged
merged 2 commits into from
Oct 10, 2024
Merged

CLOUDP-277877: Use NEXT_VERSION on make runs #1855

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f1b5a2
Use NEXT_VERSION on runs
josvazg Oct 9, 2024
26ddf70
Fix compilation version for make run
josvazg Oct 9, 2024
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
13 changes: 11 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,13 @@ DOCKER_SBOM_PLUGIN_VERSION=0.6.1
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
VERSION ?= $(shell git describe --tags --dirty --broken | cut -c 2-)

# NEXT_VERSION represents a version that is higher than anything released
# VERSION default value does not play well with the run target which might end up failing
# with errors such as:
# "version of the resource $Resource is higher than the operator version $VERSION"
# This happens if you use exported YAMLs from CLI and the dirty version is deemed a pre-release
NEXT_VERSION = 99.99.99-next

MAJOR_VERSION = $(shell cat major-version)

# CHANNELS define the bundle channels used in the bundle.
Expand Down Expand Up @@ -275,7 +282,6 @@ endif
validate-manifests: generate manifests
$(MAKE) check-missing-files


.PHONY: bundle
bundle: manifests ## Generate bundle manifests and metadata, then validate generated files.
@echo "Building bundle $(VERSION)"
Expand Down Expand Up @@ -503,13 +509,16 @@ install-credentials: set-namespace ## Install the Atlas credentials for the Oper
$(ATLAS_KEY_SECRET_NAME) atlas.mongodb.com/type=credentials

.PHONY: prepare-run
prepare-run: generate vet manifests manager run-kind install-crds install-credentials
prepare-run: generate vet manifests run-kind install-crds install-credentials
rm bin/manager
$(MAKE) manager VERSION=$(NEXT_VERSION)

.PHONY: run
run: prepare-run ## Run a freshly compiled manager against kind
ifdef RUN_YAML
kubectl apply -f $(RUN_YAML)
endif
VERSION=$(NEXT_VERSION) \
OPERATOR_POD_NAME=$(OPERATOR_POD_NAME) \
OPERATOR_NAMESPACE=$(OPERATOR_NAMESPACE) \
bin/manager --object-deletion-protection=false --log-level=$(RUN_LOG_LEVEL) \
Expand Down
Loading