This repository has been archived by the owner on Jul 11, 2023. It is now read-only.
fix(build): ensure controller version is not a chart version #1927
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Currently, we make tags of the form `v.X.Y.Z` for binary releases and `chart/X.Y.Z` for the Helm chart. The version is passed to the osm-controller binary via a linker flag. If both a chart and regular semver tag exist on the same commit, the chart tag may be passed instead of the regular version tag. This change ensures only our regular semver tags are used for the versions embedded in the binaries.
snehachhabria
approved these changes
Oct 27, 2020
shashankram
approved these changes
Oct 27, 2020
| @@ -12,7 +12,7 @@ GOBIN = $(GOPATH)/bin | |||
| GOX = go run github.com/mitchellh/gox | |||
|
|
|||
| CLI_VERSION ?= dev | |||
| CONTROLLER_VERSION = $$(git describe --abbrev=0 --tags) | |||
| CONTROLLER_VERSION = $$(git describe --abbrev=0 --tags --match "v*") | |||
There was a problem hiding this comment.
Would be good to drop a comment regarding the match.
draychev
pushed a commit
to draychev/osm
that referenced
this pull request
Oct 28, 2020
…vicemesh#1927) Currently, we make tags of the form `v.X.Y.Z` for binary releases and `chart/X.Y.Z` for the Helm chart. The version is passed to the osm-controller binary via a linker flag. If both a chart and regular semver tag exist on the same commit, the chart tag may be passed instead of the regular version tag. This change ensures only our regular semver tags are used for the versions embedded in the binaries.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description:
Currently, we make tags of the form
v.X.Y.Zfor binary releases andchart/X.Y.Zfor the Helm chart. The version is passed to theosm-controller binary via a linker flag. If both a chart and regular
semver tag exist on the same commit, the chart tag may be passed instead
of the regular version tag. This change ensures only our regular semver
tags are used for the versions embedded in the binaries.
Affected area:
Please answer the following questions with yes/no.
No