Skip to content

Commit cf42ba9

Browse files
saschagrunertsaschagrunert
committed
Drop support for docker log format
Dockershim has been removed from Kubernetes so we only need to support the CRI log format. Signed-off-by: Sascha Grunert <[email protected]>
1 parent b8bf840 commit cf42ba9

File tree

16 files changed

+1
-913
lines changed

16 files changed

+1
-913
lines changed

Diff for: ‎go.mod

-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ require (
3131
)
3232

3333
require (
34-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 // indirect
3534
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3635
github.com/Microsoft/go-winio v0.6.0 // indirect
3736
github.com/beorn7/perks v1.0.1 // indirect
@@ -66,7 +65,6 @@ require (
6665
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6766
github.com/modern-go/reflect2 v1.0.2 // indirect
6867
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
69-
github.com/pkg/errors v0.9.1 // indirect
7068
github.com/prometheus/client_golang v1.16.0 // indirect
7169
github.com/prometheus/client_model v0.3.0 // indirect
7270
github.com/prometheus/common v0.42.0 // indirect
@@ -97,7 +95,6 @@ require (
9795
google.golang.org/protobuf v1.30.0 // indirect
9896
gopkg.in/inf.v0 v0.9.1 // indirect
9997
gopkg.in/yaml.v2 v2.4.0 // indirect
100-
gotest.tools/v3 v3.4.0 // indirect
10198
k8s.io/apiserver v0.0.0 // indirect
10299
k8s.io/component-base v0.0.0 // indirect
103100
k8s.io/klog/v2 v2.100.1 // indirect

Diff for: ‎go.sum

-8
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
3434
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
3535
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
3636
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
37-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1 h1:EKPd1INOIyr5hWOWhvpmQpY6tKjeG0hT1s3AMC/9fic=
38-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1/go.mod h1:VzwV+t+dZ9j/H867F1M2ziD+yLHtB46oM35FxxMJ4d0=
3937
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
4038
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
4139
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -235,8 +233,6 @@ github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaL
235233
github.com/opencontainers/selinux v1.11.0/go.mod h1:E5dMC3VPuVvVHDYmi78qvhJp8+M586T4DlDRYpFkyec=
236234
github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
237235
github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
238-
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
239-
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
240236
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
241237
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
242238
github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8=
@@ -417,7 +413,6 @@ golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7w
417413
golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
418414
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
419415
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
420-
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
421416
golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
422417
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
423418
golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -483,7 +478,6 @@ golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc
483478
golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
484479
golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
485480
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
486-
golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
487481
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
488482
golang.org/x/tools v0.9.3/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
489483
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -599,8 +593,6 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
599593
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
600594
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
601595
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
602-
gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o=
603-
gotest.tools/v3 v3.4.0/go.mod h1:CtbdzLSsqVhDgMtKsx03ird5YTGB3ar27v0u/yKBW5g=
604596
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
605597
honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
606598
honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

Diff for: ‎pkg/validate/container.go

+1-27
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package validate
1919
import (
2020
"bufio"
2121
"context"
22-
"encoding/json"
2322
"errors"
2423
"fmt"
2524
"io/ioutil"
@@ -28,7 +27,6 @@ import (
2827
"strings"
2928
"time"
3029

31-
"github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog"
3230
"github.com/kubernetes-sigs/cri-tools/pkg/framework"
3331
internalapi "k8s.io/cri-api/pkg/apis"
3432
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
@@ -571,22 +569,6 @@ func pathExists(path string) bool {
571569
return false
572570
}
573571

574-
// parseDockerJSONLog parses logs in Docker JSON log format.
575-
// Docker JSON log format example:
576-
//
577-
// {"log":"content 1","stream":"stdout","time":"2016-10-20T18:39:20.57606443Z"}
578-
// {"log":"content 2","stream":"stderr","time":"2016-10-20T18:39:20.57606444Z"}
579-
func parseDockerJSONLog(log []byte, msg *logMessage) {
580-
var l jsonlog.JSONLog
581-
582-
err := json.Unmarshal(log, &l)
583-
framework.ExpectNoError(err, "failed with %v to unmarshal log %q", err, l)
584-
585-
msg.timestamp = l.Created
586-
msg.stream = streamType(l.Stream)
587-
msg.log = l.Log
588-
}
589-
590572
// parseCRILog parses logs in CRI log format.
591573
// CRI log format example :
592574
//
@@ -621,15 +603,7 @@ func parseLogLine(podConfig *runtimeapi.PodSandboxConfig, logPath string) []logM
621603

622604
scanner := bufio.NewScanner(f)
623605
for scanner.Scan() {
624-
line := scanner.Text()
625-
626-
// to determine whether the log is Docker format or CRI format.
627-
if strings.HasPrefix(line, "{") {
628-
parseDockerJSONLog([]byte(line), &msg)
629-
} else {
630-
parseCRILog(line, &msg)
631-
}
632-
606+
parseCRILog(scanner.Text(), &msg)
633607
msgLog = append(msgLog, msg)
634608
}
635609

Diff for: ‎vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog/jsonlog.go

-27
This file was deleted.

Diff for: ‎vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog/jsonlogbytes.go

-125
This file was deleted.

Diff for: ‎vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonlog/time_marshalling.go

-20
This file was deleted.

Diff for: ‎vendor/github.com/pkg/errors/.gitignore

-24
This file was deleted.

Diff for: ‎vendor/github.com/pkg/errors/.travis.yml

-10
This file was deleted.

Diff for: ‎vendor/github.com/pkg/errors/LICENSE

-23
This file was deleted.

0 commit comments

Comments
 (0)