Skip to content

Commit

Permalink
mv fusemanager to cmd dir
Browse files Browse the repository at this point in the history
Signed-off-by: abushwang <[email protected]>
  • Loading branch information
wswsmao committed Dec 9, 2024
1 parent 6c5a4e6 commit 2453b95
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 37 deletions.
8 changes: 4 additions & 4 deletions cmd/containerd-stargz-grpc/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ import (
"github.com/containerd/containerd/v2/pkg/sys"
"github.com/containerd/log"
"github.com/containerd/stargz-snapshotter/cmd/containerd-stargz-grpc/fsopts"
"github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager"
"github.com/containerd/stargz-snapshotter/service"
"github.com/containerd/stargz-snapshotter/service/keychain/keychainconfig"
"github.com/containerd/stargz-snapshotter/fusemanager"
snbase "github.com/containerd/stargz-snapshotter/snapshot"
"github.com/containerd/stargz-snapshotter/version"
sddaemon "github.com/coreos/go-systemd/v22/daemon"
Expand Down Expand Up @@ -181,9 +181,9 @@ func main() {
}

fuseManagerConfig := fusemanager.Config{
Config: &config.Config,
IPFS:config.IPFS,
MetadataStore: config.MetadataStore,
Config: &config.Config,
IPFS: config.IPFS,
MetadataStore: config.MetadataStore,
DefaultImageServiceAddress: defaultImageServiceAddress,
}

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"fmt"
"time"

"github.com/containerd/log"
"github.com/containerd/containerd/v2/defaults"
"github.com/containerd/containerd/v2/pkg/dialer"
"github.com/containerd/log"
"google.golang.org/grpc"
"google.golang.org/grpc/backoff"

pb "github.com/containerd/stargz-snapshotter/fusemanager/api"
pb "github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager/api"
"github.com/containerd/stargz-snapshotter/snapshot"
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import (
"golang.org/x/sys/unix"
"google.golang.org/grpc"

pb "github.com/containerd/stargz-snapshotter/fusemanager/api"
pb "github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager/api"
"github.com/containerd/stargz-snapshotter/version"
)

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ import (
bolt "go.etcd.io/bbolt"
"google.golang.org/grpc"

pb "github.com/containerd/stargz-snapshotter/fusemanager/api"
"github.com/containerd/stargz-snapshotter/cmd/containerd-stargz-grpc/fsopts"
pb "github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager/api"
"github.com/containerd/stargz-snapshotter/service"
"github.com/containerd/stargz-snapshotter/service/keychain/keychainconfig"
"github.com/containerd/stargz-snapshotter/snapshot"
Expand All @@ -46,6 +46,13 @@ const (
FuseManagerReady
)

type Config struct {
Config *service.Config
IPFS bool
MetadataStore string
DefaultImageServiceAddress string
}

type Server struct {
pb.UnimplementedStargzFuseManagerServiceServer

Expand Down
2 changes: 1 addition & 1 deletion cmd/stargz-fuse-manager/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
package main

import (
fusemanager "github.com/containerd/stargz-snapshotter/fusemanager"
fusemanager "github.com/containerd/stargz-snapshotter/cmd/stargz-fuse-manager/fusemanager"
)

func main() {
Expand Down
28 changes: 0 additions & 28 deletions fusemanager/config.go

This file was deleted.

0 comments on commit 2453b95

Please sign in to comment.