Skip to content

OCPBUGS-794: remove dependence on OLM_VERSION file #462

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
openshift-merge-robot merged 1 commit into from
Mar 3, 2023
Merged

OCPBUGS-794: remove dependence on OLM_VERSION file #462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@ BUILD_DATE := $(shell date -u +'%Y-%m-%dT%H:%M:%SZ')
# variables are inserted in Dockerfile to enable recovering the original git
# metadata at build time.
GIT_COMMIT := $(if $(SOURCE_GIT_COMMIT),$(SOURCE_GIT_COMMIT),$(shell git rev-parse HEAD))
# ART also populates OS_GIT_MAJOR, OS_GIT_MINOR, OS_GIT_PATCH, OS_GIT_VERSION
# and BUILD_VERSION as part of the Docker ENV reflecting the OpenShift version
# for the image.
# OLM_VERSION needs to be semver2 compatible for helm v2.
OLM_VERSION := $(or $(OS_GIT_VERSION),0.0.0-$(GIT_COMMIT))

GO_BUILD_OPTS := -mod=vendor
GO_BUILD_TAGS := -tags "json1"
Expand Down Expand Up @@ -69,7 +74,7 @@ $(REGISTRY_CMDS): version_flags=-ldflags "-X '$(REGISTRY_PKG)/cmd/opm/version.gi
$(REGISTRY_CMDS):
go build $(version_flags) $(GO_BUILD_OPTS) $(GO_BUILD_TAGS) -o $@ $(REGISTRY_PKG)/cmd/$(notdir $@)

$(OLM_CMDS): version_flags=-ldflags "-X $(OLM_PKG)/pkg/version.GitCommit=$(GIT_COMMIT) -X $(OLM_PKG)/pkg/version.OLMVersion=`cat staging/operator-lifecycle-manager/OLM_VERSION`"
$(OLM_CMDS): version_flags=-ldflags "-X $(OLM_PKG)/pkg/version.GitCommit=$(GIT_COMMIT) -X $(OLM_PKG)/pkg/version.OLMVersion=$(OLM_VERSION)"
$(OLM_CMDS):
go build $(version_flags) $(GO_BUILD_OPTS) $(GO_BUILD_TAGS) -o bin/$(shell basename $@) $@

Expand Down Expand Up @@ -136,7 +141,7 @@ vendor: update-plugin-deps

.PHONY: manifests
manifests: ## Generate manifests
./scripts/generate_crds_manifests.sh
OLM_VERSION=$(OLM_VERSION) ./scripts/generate_crds_manifests.sh

.PHONY: diff
diff:
Expand All @@ -145,6 +150,7 @@ diff:
verify-vendor: vendor
$(MAKE) diff

verify-manifests: OLM_VERSION=0.19.0 # set static version to avoid failing for commit based versioning
verify-manifests: manifests
$(MAKE) diff

Expand Down
2 changes: 1 addition & 1 deletion scripts/generate_crds_manifests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ CONTROLLER_GEN="go run ./vendor/sigs.k8s.io/controller-tools/cmd/controller-gen"
HELM="go run helm.sh/helm/v3/cmd/helm"


ver=$(cat ./staging/operator-lifecycle-manager/OLM_VERSION)
ver=${OLM_VERSION:-"0.0.0-dev"}
tmpdir="$(mktemp -p . -d 2>/dev/null || mktemp -d ./tmpdir.XXXXXXX)"
chartdir="${tmpdir}/chart"
crddir="${chartdir}/crds"
Expand Down