Restructure to run the logger inside of cri-dockerd

Mirantis · Oct 11, 2023 · 243657b · 243657b
1 parent f4d910e
commit 243657b
Show file tree

Hide file tree

Showing 1,103 changed files with 1,392 additions and 311,920 deletions.
diff --git a/cmd/server.go b/cmd/server.go
@@ -25,6 +25,7 @@ import (
 	"github.com/Mirantis/cri-dockerd/cmd/version"
 	"github.com/Mirantis/cri-dockerd/config"
 	"github.com/Mirantis/cri-dockerd/core"
+	"github.com/Mirantis/cri-dockerd/internal/criLogDriver"
 	"github.com/Mirantis/cri-dockerd/streaming"
 	"github.com/sirupsen/logrus"
 
@@ -35,6 +36,8 @@ import (
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
+
+	"github.com/docker/go-plugins-helpers/sdk"
 )
 
 const (
@@ -217,6 +220,12 @@ func RunCriDockerd(f *options.DockerCRIFlags, stopCh <-chan struct{}) error {
 		return err
 	}
 
+	h := sdk.NewHandler(`{"Implements": ["LoggingDriver"]}`)
+	criLogDriver.Handlers(&h, criLogDriver.NewDriver())
+	if err := h.ServeUnix("dualLoggingDriver", 0); err != nil {
+		panic(err)
+	}
+
 	logrus.Info("Starting the GRPC backend for the Docker CRI interface.")
 	server := backend.NewCriDockerServer(f.RemoteRuntimeEndpoint, ds)
 	if err := server.Start(); err != nil {

diff --git a/driver/.gitignore b/driver/.gitignore
diff --git a/driver/Makefile b/driver/Makefile
diff --git a/driver/cmd/dual-log-driver/main.go b/driver/cmd/dual-log-driver/main.go
diff --git a/driver/configs/config.json b/driver/configs/config.json
diff --git a/driver/go.mod b/driver/go.mod
diff --git a/driver/go.sum b/driver/go.sum