Out logs in cri format

.github/workflows/integration.yml

@@ -2,16 +2,15 @@ name: Integration Tests
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   integration:
     runs-on: ubuntu-20.04
     timeout-minutes: 60
     steps:
-
       - name: Set up Go 1.19.10
         uses: actions/setup-go@v1
         with:
@@ -70,7 +69,6 @@ jobs:
         with:
           repository: kubernetes-sigs/cri-tools
           path: src/sigs.k8s.io/cri-tools
-          ref: 5fd98895f3bbf8a3ba2d25e93fa95ba1e2ae0923
 
       - name: Build cri-tools
         working-directory: src/sigs.k8s.io/cri-tools

Makefile

@@ -94,10 +94,18 @@ release: static-linux deb rpm cross-arm cross-mac cross-win ## build the release
 	# linux
 	cp $(PACKAGING_DIR)/static/build/linux/cri-dockerd-$(VERSION).tgz $(RELEASE_DIR)/cri-dockerd-$(VERSION).amd64.tgz
 
+.PHONY: run
+run: cri-dockerd ## Run cri-docker in a running minikube
+	sudo ./cri-dockerd --log-level debug --network-plugin=""
+
 .PHONY: dev
 dev: cri-dockerd ## Run cri-docker in a running minikube
 	./scripts/replace-in-minikube
+
 .PHONY: docs
 docs:
 	hugo server --source docs/
 
+.PHONY: integration
+integration:
+	sudo critest -runtime-endpoint=unix:///var/run/cri-dockerd.sock -ginkgo.skip="runtime should support apparmor|runtime should support reopening container log|runtime should support execSync with timeout|runtime should support selinux|.*should support propagation.*"

core/container_start.go

@@ -19,6 +19,7 @@ package core
 import (
 	"context"
 	"fmt"
+
 	v1 "k8s.io/cri-api/pkg/apis/runtime/v1"
 )
 
@@ -30,7 +31,7 @@ func (ds *dockerService) StartContainer(
 	err := ds.client.StartContainer(r.ContainerId)
 
 	// Create container log symlink for all containers (including failed ones).
-	if linkError := ds.createContainerLogSymlink(r.ContainerId); linkError != nil {
+	if linkError := ds.createContainerKubeLogFile(r.ContainerId); linkError != nil {
 		// Do not stop the container if we failed to create symlink because:
 		//   1. This is not a critical failure.
 		//   2. We don't have enough information to properly stop container here.

core/logs.go

@@ -18,6 +18,7 @@ package core
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -26,6 +27,7 @@ import (
 	"time"
 
 	"github.com/Mirantis/cri-dockerd/config"
+	"github.com/nxadm/tail"
 
 	"github.com/armon/circbuf"
 	dockertypes "github.com/docker/docker/api/types"
@@ -85,6 +87,7 @@ func (ds *dockerService) GetContainerLogs(
 		stderr = SharedLimitWriter(stderr, &max)
 		stdout = SharedLimitWriter(stdout, &max)
 	}
+
 	sopts := libdocker.StreamOptions{
 		OutputStream: stdout,
 		ErrorStream:  stderr,
@@ -155,7 +158,9 @@ func (ds *dockerService) getContainerLogPath(containerID string) (string, string
 	if err != nil {
 		return "", "", fmt.Errorf("failed to inspect container %q: %v", containerID, err)
 	}
+
 	return info.Config.Labels[containerLogPathLabelKey], info.LogPath, nil
+	// return info.Config.Labels[containerLogPathLabelKey], "./" + containerID + ".log", nil
 }
 
 // createContainerLogSymlink creates the symlink for docker container log.
@@ -222,3 +227,103 @@ func (ds *dockerService) removeContainerLogSymlink(containerID string) error {
 	}
 	return nil
 }
+
+// createContainerKubeLogFile creates the kube log file for docker container log.
+func (ds *dockerService) createContainerKubeLogFile(containerID string) error {
+	kubePath, dockerPath, err := ds.getContainerLogPath(containerID)
+	if err != nil {
+		return fmt.Errorf("failed to get container %q log path: %v", containerID, err)
+	}
+
+	if kubePath == "" {
+		logrus.Debugf("Container log path for Container ID %s isn't specified, will not create kubepath", containerID)
+		return nil
+	}
+
+	if dockerPath != "" {
+		// Only create the kube log file when container log path is specified and log file exists.
+		// Delete possibly existing file first
+		if err = ds.os.Remove(kubePath); err == nil {
+			logrus.Debugf("Deleted previously existing kube log file: %s", kubePath)
+		}
+
+		_, err = os.Create(kubePath)
+		if err != nil {
+			return fmt.Errorf(
+				"failed to create the kube log file %q to the container log file %q for container %q: %v",
+				kubePath,
+				dockerPath,
+				containerID,
+				err,
+			)
+
+		}
+
+		go func() {
+			// Open the kube file for output
+			kubeFile, err := os.OpenFile(kubePath, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
+			if err != nil {
+				logrus.Errorf(
+					"failed to open kube log file %s: %v",
+					kubePath,
+					err,
+				)
+				panic(err)
+			}
+			defer kubeFile.Close()
+
+			// Tail the docker file for input
+			t, err := tail.TailFile(dockerPath, tail.Config{
+				Follow: true,
+				ReOpen: true})
+			if err != nil {
+				logrus.Errorf(
+					"failed to tail docker log file %s: %v",
+					dockerPath,
+					err,
+				)
+				panic(err)
+			}
+			// Watch for changes to be copied over
+			for line := range t.Lines {
+				logLine := Log{}
+				json.Unmarshal([]byte(line.Text), &logLine)
+
+				_, err := kubeFile.WriteString(logLine.CRIFormat())
+				if err != nil {
+					logrus.Errorf(
+						"failed to write to kube log file %s: %v",
+						kubePath,
+						err,
+					)
+					return
+				}
+			}
+		}()
+	} else {
+		supported, err := ds.IsCRISupportedLogDriver()
+		if err != nil {
+			logrus.Errorf("Failed to check supported logging driver for CRI: %v", err)
+			return nil
+		}
+
+		if supported {
+			logrus.Info("Cannot create kube log file because container log file doesn't exist!")
+		} else {
+			logrus.Debug("Unsupported logging driver by CRI")
+		}
+	}
+
+	return nil
+}
+
+type Log struct {
+	Log    string    `json:"log"`
+	Stream string    `json:"stream"`
+	Time   time.Time `json:"time"`
+}
+
+// CRIFormat returns the log in the CRI format
+func (l Log) CRIFormat() string {
+	return fmt.Sprintf("%s %s  %s", l.Time.Format(time.RFC3339), l.Stream, l.Log)
+}

go.mod

@@ -14,6 +14,7 @@ require (
 	github.com/docker/go-connections v0.4.0
 	github.com/emicklei/go-restful v2.16.0+incompatible
 	github.com/golang/mock v1.6.0
+	github.com/nxadm/tail v1.4.8
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/image-spec v1.1.0-rc3
 	github.com/opencontainers/runc v1.1.5
@@ -124,6 +125,7 @@ require (
 	google.golang.org/genproto v0.0.0-20230106154932-a12b697841d9 // indirect
 	google.golang.org/protobuf v1.28.1 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/cloud-provider v0.22.8 // indirect