build: move dataplane commit metadata to runtime image labels#876
Open
build: move dataplane commit metadata to runtime image labels#876
Conversation
sknat
reviewed
Feb 6, 2026
Collaborator
There was a problem hiding this comment.
Agreed, this would work, but I think I'd be more comfortable with
an approach where we:
- remove the
VPP-dataplane versionandImage tagfrom the calicovppversion file - Add the following to our dockerfiles
ARG GIT_COMMIT=unknown
LABEL git-commit=$GIT_COMMIT- run our builds with
docker build --build-arg GIT_COMMIT=$(git log -1 --oneline) - This should be relatively easy as we have
DOCKER_BUILD_ARGSreferenced everywhere
That way the VPP version file will rightfully belong alongside VPP build
What do you think ?
Do not write image tag and dataplane git commit into calicovppversion. Keep calicovppversion owned by VPP build metadata (generate.log) and publish dataplane commit via docker build arg + git-commit label. - Add shared GIT_COMMIT build arg in DOCKER_BUILD_ARGS - Add ARG/LABEL git-commit to runtime Dockerfiles: agent, calicovppctl, multinet-monitor, vpp, vpp-debug, vclsidecar, vclsidecar-debug, init-eks - Remove image tag/dataplane commit lines from version-file generation in agent/multinet-monitor/vpp-manager make paths Signed-off-by: Aritra Basu <aritrbas@cisco.com>
aritrbas
force-pushed
the
abasu-fix-version
branch
from
e26cc97 to
edcfbe5
Compare
aritrbas
changed the title
Collaborator
Author
Agreed, fixed in the latest patch. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
RCA:
We were writing dataplane commit and image tag into
calicovppversion, but that file is part of VPP artifacts and can come from a reusedvpp-${VPP_HASH}.tarcache (either local or S3 in CI). When the cache is reused, those fields become stale.Fix:
calicovppversiongeneration.calicovppversionsourced from VPP-generated metadata (generate.log), so ownership stays with VPP build artifacts.--build-arg GIT_COMMIT="$(git log -1 --oneline)"via sharedDOCKER_BUILD_ARGS.ARG GIT_COMMIT=unknownandLABEL git-commit=$GIT_COMMITto runtime imageDockerfiles for the following components:agent,calicovppctl,multinet-monitor,vpp,vpp-debug,vclsidecar,vclsidecar-debug,init-eks