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

refactor: remove cri wrapper #2613

Merged
merged 2 commits into from
Jan 13, 2019
Merged

refactor: remove cri wrapper #2613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bd7a84
refactor cri
zhuangqh Dec 29, 2018
837f3f2
remove cri wrapper, using grpc interceptor
zhuangqh Dec 29, 2018
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
3 changes: 1 addition & 2 deletions cri/criservice.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import (
criv1alpha1 "github.com/alibaba/pouch/cri/v1alpha1"
servicev1alpha1 "github.com/alibaba/pouch/cri/v1alpha1/service"
criv1alpha2 "github.com/alibaba/pouch/cri/v1alpha2"
servicev1alpha2 "github.com/alibaba/pouch/cri/v1alpha2/service"
"github.com/alibaba/pouch/daemon/config"
"github.com/alibaba/pouch/daemon/mgr"
"github.com/alibaba/pouch/hookplugins"
Expand Down Expand Up @@ -101,7 +100,7 @@ func runv1alpha2(daemonconfig *config.Config, containerMgr mgr.ContainerMgr, ima
return fmt.Errorf("failed to get CriManager with error: %v", err)
}

service, err := servicev1alpha2.NewService(daemonconfig, criMgr)
service, err := criv1alpha2.NewService(daemonconfig, criMgr)
if err != nil {
streamRouterCh <- nil
readyCh <- false
Expand Down
18 changes: 0 additions & 18 deletions cri/utils/utils.go
View file
Open in desktop

This file was deleted.

66 changes: 0 additions & 66 deletions cri/utils/utils_test.go
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions cri/v1alpha1/cri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
anno "github.com/alibaba/pouch/cri/annotations"
cni "github.com/alibaba/pouch/cri/ocicni"
"github.com/alibaba/pouch/cri/stream"
criutils "github.com/alibaba/pouch/cri/utils"
"github.com/alibaba/pouch/ctrd"
"github.com/alibaba/pouch/daemon/config"
"github.com/alibaba/pouch/daemon/mgr"
Expand Down Expand Up @@ -834,7 +833,7 @@ func (c *CriManager) ListContainerStats(ctx context.Context, r *runtime.ListCont
return false
}
if r.GetFilter().GetLabelSelector() != nil &&
!criutils.MatchLabelSelector(r.GetFilter().GetLabelSelector(), c.Config.Labels) {
!utils.MatchLabelSelector(r.GetFilter().GetLabelSelector(), c.Config.Labels) {
return false
}
return true
Expand Down
39 changes: 15 additions & 24 deletions cri/v1alpha2/cri.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/alibaba/pouch/cri/metrics"
cni "github.com/alibaba/pouch/cri/ocicni"
"github.com/alibaba/pouch/cri/stream"
criutils "github.com/alibaba/pouch/cri/utils"
metatypes "github.com/alibaba/pouch/cri/v1alpha2/types"
"github.com/alibaba/pouch/ctrd"
"github.com/alibaba/pouch/daemon/config"
"github.com/alibaba/pouch/daemon/mgr"
Expand All @@ -32,7 +32,6 @@ import (
util_metrics "github.com/alibaba/pouch/pkg/utils/metrics"
"github.com/alibaba/pouch/version"

// NOTE: "golang.org/x/net/context" is compatible with standard "context" in golang1.7+.
"github.com/cri-o/ocicni/pkg/ocicni"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
Expand Down Expand Up @@ -114,7 +113,7 @@ type CriManager struct {
CriPlugin hookplugins.CriPlugin

// StreamServer is the stream server of CRI serves container streaming request.
StreamServer Server
StreamServer StreamServer

// SandboxBaseDir is the directory used to store sandbox files like /etc/hosts, /etc/resolv.conf, etc.
SandboxBaseDir string
Expand All @@ -137,19 +136,11 @@ type CriManager struct {

// NewCriManager creates a brand new cri manager.
func NewCriManager(config *config.Config, ctrMgr mgr.ContainerMgr, imgMgr mgr.ImageMgr, volumeMgr mgr.VolumeMgr, criPlugin hookplugins.CriPlugin) (CriMgr, error) {
var streamServerAddress string
streamServerPort := config.CriConfig.StreamServerPort
// If stream server reuse the pouchd's port, extract the ip and port from pouchd's listening addresses.
if config.CriConfig.StreamServerReusePort {
streamServerAddress, streamServerPort = extractIPAndPortFromAddresses(config.Listen)
if streamServerPort == "" {
return nil, fmt.Errorf("failed to extract stream server's port from pouchd's listening addresses")
}
streamCfg, err := toStreamConfig(config)
if err != nil {
return nil, err
}

// If the reused pouchd's port is https, the url that stream server return should be with https scheme.
reuseHTTPSPort := config.CriConfig.StreamServerReusePort && config.TLS.Key != "" && config.TLS.Cert != ""
streamServer, err := newStreamServer(ctrMgr, streamServerAddress, streamServerPort, reuseHTTPSPort)
streamServer, err := NewStreamServer(streamCfg, stream.NewStreamRuntime(ctrMgr))
if err != nil {
return nil, fmt.Errorf("failed to create stream server for cri manager: %v", err)
}
Expand All @@ -176,7 +167,7 @@ func NewCriManager(config *config.Config, ctrMgr mgr.ContainerMgr, imgMgr mgr.Im
Buckets: []meta.Bucket{
{
Name: meta.MetaJSONFile,
Type: reflect.TypeOf(SandboxMeta{}),
Type: reflect.TypeOf(metatypes.SandboxMeta{}),
},
},
})
Expand All @@ -201,15 +192,15 @@ func NewCriManager(config *config.Config, ctrMgr mgr.ContainerMgr, imgMgr mgr.Im
logrus.Infof("disable cri to collect stats from containerd periodically")
}

return NewCriWrapper(c), nil
return c, nil
}

// StreamServerStart starts the stream server of CRI.
func (c *CriManager) StreamServerStart() error {
return c.StreamServer.Start()
}

// StreamRouter returns the router of Stream Server.
// StreamRouter returns the router of Stream StreamServer.
func (c *CriManager) StreamRouter() stream.Router {
return c.StreamServer
}
Expand Down Expand Up @@ -253,7 +244,7 @@ func (c *CriManager) RunPodSandbox(ctx context.Context, r *runtime.RunPodSandbox
if err != nil {
return nil, err
}
sandboxMeta := &SandboxMeta{
sandboxMeta := &metatypes.SandboxMeta{
ID: id,
}
if err := c.SandboxStore.Put(sandboxMeta); err != nil {
Expand Down Expand Up @@ -384,7 +375,7 @@ func (c *CriManager) StartPodSandbox(ctx context.Context, r *runtime.StartPodSan
if err != nil {
return nil, fmt.Errorf("failed to get metadata of %q from SandboxStore: %v", podSandboxID, err)
}
sandboxMeta := res.(*SandboxMeta)
sandboxMeta := res.(*metatypes.SandboxMeta)

// setup networking for the sandbox.
networkNamespaceMode := sandboxMeta.Config.GetLinux().GetSecurityContext().GetNamespaceOptions().GetNetwork()
Expand Down Expand Up @@ -415,7 +406,7 @@ func (c *CriManager) StopPodSandbox(ctx context.Context, r *runtime.StopPodSandb
if err != nil {
return nil, fmt.Errorf("failed to get metadata of %q from SandboxStore: %v", podSandboxID, err)
}
sandboxMeta := res.(*SandboxMeta)
sandboxMeta := res.(*metatypes.SandboxMeta)

opts := &mgr.ContainerListOption{All: true}
filter := func(c *mgr.Container) bool {
Expand Down Expand Up @@ -549,7 +540,7 @@ func (c *CriManager) PodSandboxStatus(ctx context.Context, r *runtime.PodSandbox
if err != nil {
return nil, fmt.Errorf("failed to get metadata of %q from SandboxStore: %v", podSandboxID, err)
}
sandboxMeta := res.(*SandboxMeta)
sandboxMeta := res.(*metatypes.SandboxMeta)

sandbox, err := c.ContainerMgr.Get(ctx, podSandboxID)
if err != nil {
Expand Down Expand Up @@ -679,7 +670,7 @@ func (c *CriManager) CreateContainer(ctx context.Context, r *runtime.CreateConta
if err != nil {
return nil, fmt.Errorf("failed to get metadata of %q from SandboxStore: %v", podSandboxID, err)
}
sandboxMeta := res.(*SandboxMeta)
sandboxMeta := res.(*metatypes.SandboxMeta)
sandboxMeta.NetNS = containerNetns(sandbox)

labels := makeLabels(config.GetLabels(), config.GetAnnotations())
Expand Down Expand Up @@ -1063,7 +1054,7 @@ func (c *CriManager) ListContainerStats(ctx context.Context, r *runtime.ListCont
return false
}
if r.GetFilter().GetLabelSelector() != nil &&
!criutils.MatchLabelSelector(r.GetFilter().GetLabelSelector(), c.Config.Labels) {
!utils.MatchLabelSelector(r.GetFilter().GetLabelSelector(), c.Config.Labels) {
return false
}
return true
Expand Down
65 changes: 0 additions & 65 deletions cri/v1alpha2/cri_stream.go
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions cri/v1alpha2/cri_stream_test.go
View file
Open in desktop

This file was deleted.

Loading