Sok3t/descheduler
1
0
Fork 0
mirror of https://github.com/kubernetes-sigs/descheduler.git synced 2026-01-28 06:29:29 +01:00
Code Packages Releases Activity

Fix version command to parse helm chart tags

Browse Source
This commit is contained in:
Mike Dame
2022-05-31 17:29:25 +00:00
parent 0a4bcdaea1
commit 55ab0deaf7
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -15,7 +15,7 @@
.PHONY: test .PHONY: test
# VERSION is based on a date stamp plus the last commit # VERSION is based on a date stamp plus the last commit
VERSION?=v$(shell date +%Y%m%d)-$(shell git describe --tags --match "v*") VERSION?=v$(shell date +%Y%m%d)-$(shell git describe --tags)
BRANCH?=$(shell git branch --show-current) BRANCH?=$(shell git branch --show-current)
SHA1?=$(shell git rev-parse HEAD) SHA1?=$(shell git rev-parse HEAD)
BUILD=$(shell date +%FT%T%z) BUILD=$(shell date +%FT%T%z)

12
pkg/version/version.go
View File

@@ -80,9 +80,19 @@ func splitVersion(version string) (string, string) {
// Version from an automated container build environment(not a tag) or a local build. For example v20201009-v0.18.0-46-g939c1c0. // Version from an automated container build environment(not a tag) or a local build. For example v20201009-v0.18.0-46-g939c1c0.
m2, _ := regexp.MatchString(`^v\d{8}-v\d+\.\d+\.\d+-\w+-\w+$`, version) m2, _ := regexp.MatchString(`^v\d{8}-v\d+\.\d+\.\d+-\w+-\w+$`, version)
// Version tagged by helm chart releaser action
helm, _ := regexp.MatchString(`^v\d{8}-descheduler-helm-chart-\d+\.\d+\.\d+$`, version)
// Dirty version where helm chart is the last known tag
helm2, _ := regexp.MatchString(`^v\d{8}-descheduler-helm-chart-\d+\.\d+\.\d+-\w+-\w+$`, version)
if m1 || m2 { if m1 || m2 {
semVer := strings.Split(version, "-")[1] semVer := strings.Split(version, "-")[1]
return strings.Trim(strings.Split(semVer, ".")[0], "v"), strings.Split(semVer, ".")[1] + "+" return strings.Trim(strings.Split(semVer, ".")[0], "v"), strings.Split(semVer, ".")[1] + "." + strings.Split(semVer, ".")[2]
}
if helm || helm2 {
semVer := strings.Split(version, "-")[4]
return strings.Split(semVer, ".")[0], strings.Split(semVer, ".")[1] + "." + strings.Split(semVer, ".")[2]
} }
// Something went wrong // Something went wrong