Skip to content

Take pkg/hooks from github.com/containers/common#46

Closed
eclipseo wants to merge 1 commit intocontainerd:mainfrom
eclipseo:relocate_hooks
Closed

Take pkg/hooks from github.com/containers/common#46
eclipseo wants to merge 1 commit intocontainerd:mainfrom
eclipseo:relocate_hooks

Conversation

@eclipseo
Copy link
Copy Markdown

@eclipseo eclipseo commented Aug 7, 2023

pkg/hooks was moved from github.com/containers/podman/v4 to github.com/containers/common and it's to much time consuming to keep packaging github.com/containers/podman/v3.

@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Aug 7, 2023 •
edited
Loading

Codecov Report

Patch and project coverage have no change.

Comparison is base (040229d) 64.38% compared to head (5144aa9) 64.38%.
Report is 2 commits behind head on main.

❗ Current head 5144aa9 differs from pull request most recent head d708940. Consider uploading reports for the commit d708940 to get more accurate results

Additional details and impacted files 
@@           Coverage Diff           @@
##             main      #46   +/-   ##
=======================================
  Coverage   64.38%   64.38%           
=======================================
  Files           9        9           
  Lines        1800     1800           
=======================================
  Hits         1159     1159           
  Misses        495      495           
  Partials      146      146

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@mikebrow mikebrow requested a review from klihub August 7, 2023 23:55
@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Aug 7, 2023

Pls sign commits with real name and email. Cheers!

klihub
klihub reviewed Aug 8, 2023
View reviewed changes
plugins/hook-injector/hook-injector.go Outdated
"github.com/containerd/nri/pkg/api"
"github.com/containerd/nri/pkg/stub"
"github.com/containers/podman/v3/pkg/hooks"
hooks "github.com/containers/common/pkg/hooks/1.0.0"
Copy link
Copy Markdown
Member

@klihub klihub Aug 8, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAICT this does not compile if imported like this. I think it should be without /1.0.0, simply as

        "github.com/containers/common/pkg/hooks"

Like it's done here in cri-o.

Copy link
Copy Markdown
Author

@eclipseo eclipseo Aug 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok done that.

klihub
klihub requested changes Aug 8, 2023
View reviewed changes
Copy link
Copy Markdown
Member

@klihub klihub left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix the new import path and update your commit (to be signed) according to @mikebrow 's instructions.

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Aug 23, 2023

@eclipseo wave..

@eclipseo
Copy link
Copy Markdown
Author

eclipseo commented Aug 24, 2023

Ok fixed the import path and signed the commit.

@eclipseo eclipseo force-pushed the relocate_hooks branch 3 times, most recently from 363853f to ea3e4ba Compare August 24, 2023 05:53
@eclipseo
Copy link
Copy Markdown
Author

eclipseo commented Aug 24, 2023 

 Building /home/runner/work/nri/nri/src/github.com/containerd/nri/build/bin/logger...
go: downloading github.com/sirupsen/logrus v1.9.0
go: downloading sigs.k8s.io/yaml v1.3.0
go: downloading github.com/containerd/ttrpc v1.1.1-0.20220420014843-944ef4a40df3
go: downloading github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb
go: downloading google.golang.org/protobuf v1.28.1
go: downloading k8s.io/cri-api v0.25.3
go: downloading golang.org/x/sys v0.1.0
go: downloading gopkg.in/yaml.v2 v2.4.0
go: downloading google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21
go: downloading google.golang.org/grpc v1.47.0
go: downloading golang.org/x/net v0.1.0
go: downloading github.com/golang/protobuf v1.5.2
go: downloading golang.org/x/text v0.4.0
go: updates to go.mod needed; to update it:
	go mod tidy
make: *** [Makefile:93: /home/runner/work/nri/nri/src/github.com/containerd/nri/build/bin/logger] Error 1
Error: Process completed with exit code 2.

I did do a go mod tidy, and doing another one does nothing.

@eclipseo eclipseo force-pushed the relocate_hooks branch 2 times, most recently from 1179ead to b9a67cd Compare August 25, 2023 16:21
Take pkg/hooks from github.com/containers/common
d708940 
pkg/hooks was moved from github.com/containers/podman/v4 to
github.com/containers/common and it's to much time consuming to
keep packaging github.com/containers/podman/v3.

Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
@thaJeztah thaJeztah mentioned this pull request Sep 15, 2023
Merged
@thaJeztah
Copy link
Copy Markdown
Member

thaJeztah commented Sep 15, 2023

I gave it a quick go to carry the change in #55

changes compared to this PR;

rebase (we merged the "remove containerd dependency"
removed changes from other plugin go mods (keeping the PR focussed on just this change)
updated to containers/common v0.56.0 (which uses runtime spec v1.1.0 instead of -rc.3)

@klihub
Copy link
Copy Markdown
Member

klihub commented Sep 15, 2023

Replaced by #55.

@klihub klihub closed this Sep 15, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@klihub klihub klihub requested changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@eclipseo @codecov-commenter @mikebrow @thaJeztah @klihub