-
Notifications
You must be signed in to change notification settings - Fork 24
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.
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
chore: Inject COLLECTOR_VERSION
into Konflux-built images
#1694
Conversation
e3f5c55
to
eb4d122
Compare
COLLECTOR_VERSION
into Konflux-built images
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Two style nits, LGTM.
Also the correct version is logged:
|
Regarding validation of GHA images. Due to a known thing, collector images in PR get a different tag. |
because that's how many cpu cores I gave it in Tekton resource overrides.
Because that's the proper name expected for external override.
Co-authored-by: Tom Martensen <[email protected]>
Co-authored-by: Tom Martensen <[email protected]>
fd9df34
to
4fb5f6d
Compare
Creation of test VMs is known to be broken ATM. https://redhat-internal.slack.com/archives/CFMQ5C2TT/p1717585747118389 Will merge. |
Description
Following up on ROX-19958, I decided to check if
make tag
for collector would print the same thing as we tag the image. It will not. Here I try to address that.The only place I found where
COLLECTOR_TAG
/COLLECTOR_VERSION
is meaningfully used is logging during the startupcollector/collector/container/scripts/bootstrap.sh
Line 78 in 8198c30
This is, for reference, how
COLLECTOR_VERSION
is set downstream: https://gitlab.cee.redhat.com/stackrox/rhacs-midstream/-/blob/50310ae51698a9f1a27382764dd9957fb12ab75c/distgit/containers/rhacs-collector/Dockerfile.in#L109I conclude, the precision is not very important there, it is free-form, and
3.18.x-284-ge3f5c5566c-fast
should be fine.Also, as Tom looked into Konflux releases, I think
version
label contents aren't important for releasing (unlike downstream where it is important). Therefore, I'm addressing that thing.If/when we will retag images, we can revisit the label but that's for later.
NPROC
change is not connected to everything else but why not.Checklist
[ ] Updated documentation accordingly- not needed.Automated testing
None will be added.
Testing Performed
-fast
suffix in tag.make tag
manually ran in the repo does not fail and does not output-fast
.version
label and has$COLLECTOR_VERSION
environment variable defined.