Skip to content

Commit f629ef9

Browse files
Remove GIT_HASH from HELM_TAG to match release CLI lookup (#5188)
1 parent 7d0163e commit f629ef9

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

projects/tinkerbell/tinkerbell/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@ HELM_DESTINATION_REPOSITORY=tinkerbell/tinkerbell/tinkerbell-helm
5555
HELM_IMAGE_LIST=tinkerbell/tinkerbell/tinkerbell tinkerbell/tinkerbell/tink-agent
5656

5757
# When GIT_TAG is a commit SHA (not semver), helm package requires a valid semver version.
58-
# Override HELM_TAG with a semver wrapper: 0.0.1-<commit>-<build-tooling-hash>
58+
# Override HELM_TAG with a semver wrapper: 0.0.1-<commit>
5959
# This must match the NonProdSourceImageTagFormat in eks-anywhere release CLI bundle_release.go
60-
HELM_TAG=0.0.1-$(GIT_TAG)-$(GIT_HASH)
60+
HELM_TAG=0.0.1-$(GIT_TAG)
6161

6262
# Exclude from upgrade buildspec until migration is complete
6363
EXCLUDE_FROM_UPGRADE_BUILDSPEC=true

projects/tinkerbell/tinkerbell/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,10 @@ Note: `secondstar` (SSH over serial) is excluded via patch as EKS-A does not use
4040

4141
- Repository: https://github.com/tinkerbell/tinkerbell
4242
- The mono-repo consolidates: boots→smee, tink, rufio, hegel→tootles
43+
44+
## GIT_TAG
45+
46+
The `GIT_TAG` file uses a commit SHA from the upstream tinkerbell mono-repo. Since helm
47+
requires valid semver for chart versions, the Makefile overrides `HELM_TAG` with a `0.0.1-`
48+
prefix and the sedfile template uses `${HELM_TAG}` for the chart version. The release CLI
49+
in eks-anywhere uses a matching `"0.0.1-<gitTag>"` format for source image lookup.

0 commit comments

Comments
 (0)