Skip to content
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.

Sign up for GitHub

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

Jump to bottom

fix: add namespace flag for nydusify commit. #1597

Merged
merged 1 commit into from
Jul 9, 2024
Merged

fix: add namespace flag for nydusify commit. #1597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions contrib/nydusify/cmd/nydusify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,6 +1179,13 @@ func main() {
Usage: "Containerd address, optionally with \"unix://\" prefix [$CONTAINERD_ADDRESS] (default \"/run/containerd/containerd.sock\")",
EnvVars: []string{"CONTAINERD_ADDR"},
},
&cli.StringFlag{
Name: "namespace",
PerseidMeteor marked this conversation as resolved.
Show resolved Hide resolved
Aliases: []string{"n"},
Value: "default",
Usage: "Container namespace, default with \"default\" namespace",
EnvVars: []string{"NAMESPACE"},
},
&cli.StringFlag{
Name: "container",
Required: true,
Expand Down Expand Up @@ -1244,6 +1251,7 @@ func main() {
WorkDir: c.String("work-dir"),
NydusImagePath: c.String("nydus-image"),
ContainerdAddress: c.String("containerd-address"),
Namespace: c.String("namespace"),
ContainerID: c.String("container"),
TargetRef: c.String("target"),
SourceInsecure: c.Bool("source-insecure"),
Expand Down
3 changes: 3 additions & 0 deletions contrib/nydusify/pkg/committer/commiter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"time"

"github.com/containerd/containerd/content/local"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/reference/docker"
"github.com/containerd/nydus-snapshotter/pkg/converter"
"github.com/dragonflyoss/nydus/contrib/nydusify/pkg/committer/diff"
Expand All @@ -38,6 +39,7 @@ type Opt struct {
WorkDir string
ContainerdAddress string
NydusImagePath string
Namespace string

ContainerID string
SourceInsecure bool
Expand Down Expand Up @@ -79,6 +81,7 @@ func NewCommitter(opt Opt) (*Committer, error) {
}

func (cm *Committer) Commit(ctx context.Context, opt Opt) error {
ctx = namespaces.WithNamespace(ctx, opt.Namespace)
targetRef, err := ValidateRef(opt.TargetRef)
if err != nil {
return errors.Wrap(err, "parse target image name")
Expand Down
4 changes: 0 additions & 4 deletions contrib/nydusify/pkg/committer/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"strings"

"github.com/containerd/containerd"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"

"github.com/pkg/errors"
Expand Down Expand Up @@ -40,7 +39,6 @@ func NewManager(addr string) (*Manager, error) {
}

func (m *Manager) Pause(ctx context.Context, containerID string) error {
ctx = namespaces.WithNamespace(ctx, "default")
client, err := containerd.New(m.address)
if err != nil {
return errors.Wrapf(err, "create client")
Expand All @@ -58,7 +56,6 @@ func (m *Manager) Pause(ctx context.Context, containerID string) error {
}

func (m *Manager) UnPause(ctx context.Context, containerID string) error {
ctx = namespaces.WithNamespace(ctx, "default")
client, err := containerd.New(m.address)
if err != nil {
return errors.Wrapf(err, "create client")
Expand All @@ -76,7 +73,6 @@ func (m *Manager) UnPause(ctx context.Context, containerID string) error {
}

func (m *Manager) Inspect(ctx context.Context, containerID string) (*InspectResult, error) {
ctx = namespaces.WithNamespace(ctx, "default")
client, err := containerd.New(m.address)
if err != nil {
return nil, errors.Wrapf(err, "create client")
Expand Down
Loading