Include NRI in "info" output #6710
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. 📢 Thoughts on this report? Let us know! |
vendor.mod
Outdated
|
|
||
| replace github.com/moby/moby/client => github.com/moby/moby/client v0.0.0-20251216111441-25fbe6cd43eb | ||
|
|
||
| replace github.com/moby/moby/api => github.com/moby/moby/api v0.0.0-20251216111441-25fbe6cd43eb |
There was a problem hiding this comment.
Are replace rules needed? Wouldn't vendoring the pseudo-version with the newest commit work?
There was a problem hiding this comment.
I tried that first, but make vendor ( the "tidy" I guess) just resets the API to the released version ... happy to change it if there's a better way though?
There was a problem hiding this comment.
Yeah it should work, see: 649b792
This is how I did it:
- Replace refs with
master:
diff --git vendor.mod vendor.mod
index e21c8bb8a9..76818c1743 100644
--- vendor.mod
+++ vendor.mod
@@ -28,8 +28,8 @@ require (
github.com/google/uuid v1.6.0
github.com/mattn/go-runewidth v0.0.19
github.com/moby/go-archive v0.1.0
- github.com/moby/moby/api v1.52.0
- github.com/moby/moby/client v0.2.1
+ github.com/moby/moby/api master
+ github.com/moby/moby/client master
github.com/moby/patternmatcher v0.6.0
github.com/moby/swarmkit/v2 v2.1.1
github.com/moby/sys/atomicwriter v0.1.0-
Run
make -f docker.Makefile vendor -
The go pseudo version should now be adjusted to match the commit from master:
$ git diff vendor.mod
diff --git vendor.mod vendor.mod
index e21c8bb8a9..afe83b4628 100644
--- vendor.mod
+++ vendor.mod
@@ -28,8 +28,8 @@ require (
github.com/google/uuid v1.6.0
github.com/mattn/go-runewidth v0.0.19
github.com/moby/go-archive v0.1.0
- github.com/moby/moby/api v1.52.0
- github.com/moby/moby/client v0.2.1
+ github.com/moby/moby/api v1.52.1-0.20251216125034-b2d84a3ef5a9
+ github.com/moby/moby/client v0.2.2-0.20251216125034-b2d84a3ef5a9
github.com/moby/patternmatcher v0.6.0
github.com/moby/swarmkit/v2 v2.1.1
github.com/moby/sys/atomicwriter v0.1.0
$ git diff --stat
vendor.mod | 4 +--
vendor.sum | 8 +++---
vendor/github.com/moby/moby/api/LICENSE | 17 +++++++++---
.../github.com/moby/moby/api/types/image/image_history.go | 39 ---------------------------
vendor/github.com/moby/moby/api/types/system/info.go | 6 +++++
vendor/github.com/moby/moby/client/LICENSE | 17 +++++++++---
vendor/github.com/moby/moby/client/client.go | 2 +-
vendor/modules.txt | 4 +--
8 files changed, 43 insertions(+), 54 deletions(-)There was a problem hiding this comment.
That worked - thank you ... I'd tried with the v0.0.0 thing instead of master.
There was a problem hiding this comment.
You can also just use a specific git commit - the go mod tidy will be able to resolve it to a proper Go pseudo version
Signed-off-by: Rob Murray <[email protected]>
Signed-off-by: Rob Murray <[email protected]>
thaJeztah
left a comment
There was a problem hiding this comment.
changes LGTM; leaving a "request changes" review in case we'll be doing more 29.1.x patch releases (with tagged version of the modules).
remind me though to merge this before we do a v29.2.x
|
We want to cut an RC today, so we want to merge it already. We can always branch off later. |
- What I did
related to NRI: initial implementation moby/moby#51511
Add replace rules to pick up moby api/client modules with the NRI changes.
Display NRI info if present in the API response.
- How I did it
- How to verify it
- Human readable description for the release notes
- A picture of a cute animal (not mandatory but encouraged)