Skip to content

Commit 474135f

Browse files
authored
Merge pull request moby#5769 from tonistiigi/cdi-fsnotify-fix
vendor: cdi v0.8.1 for panic fix
2 parents a20380c + 049f92d commit 474135f

File tree

5 files changed

+19
-4
lines changed

5 files changed

+19
-4
lines changed

cmd/buildkitd/main.go

+7
Original file line numberDiff line numberDiff line change
@@ -1067,6 +1067,13 @@ func getCDIManager(cfg config.CDIConfig) (*cdidevices.Manager, error) {
10671067
if err := cdiCache.Refresh(); err != nil {
10681068
return nil, err
10691069
}
1070+
if errs := cdiCache.GetErrors(); len(errs) > 0 {
1071+
for dir, errs := range errs {
1072+
for _, err := range errs {
1073+
bklog.L.Warnf("CDI setup error %v: %+v", dir, err)
1074+
}
1075+
}
1076+
}
10701077
return cdiCache, nil
10711078
}()
10721079
if err != nil {

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ require (
108108
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.5.1
109109
google.golang.org/protobuf v1.35.2
110110
kernel.org/pub/linux/libs/security/libcap/cap v1.2.73
111-
tags.cncf.io/container-device-interface v0.8.0
111+
tags.cncf.io/container-device-interface v0.8.1
112112
)
113113

114114
require (

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ kernel.org/pub/linux/libs/security/libcap/psx v1.2.73/go.mod h1:+l6Ee2F59XiJ2I6W
590590
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
591591
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
592592
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
593-
tags.cncf.io/container-device-interface v0.8.0 h1:8bCFo/g9WODjWx3m6EYl3GfUG31eKJbaggyBDxEldRc=
594-
tags.cncf.io/container-device-interface v0.8.0/go.mod h1:Apb7N4VdILW0EVdEMRYXIDVRZfNJZ+kmEUss2kRRQ6Y=
593+
tags.cncf.io/container-device-interface v0.8.1 h1:c0jN4Mt6781jD67NdPajmZlD1qrqQyov/Xfoab37lj0=
594+
tags.cncf.io/container-device-interface v0.8.1/go.mod h1:Apb7N4VdILW0EVdEMRYXIDVRZfNJZ+kmEUss2kRRQ6Y=
595595
tags.cncf.io/container-device-interface/specs-go v0.8.0 h1:QYGFzGxvYK/ZLMrjhvY0RjpUavIn4KcmRmVP/JjdBTA=
596596
tags.cncf.io/container-device-interface/specs-go v0.8.0/go.mod h1:BhJIkjjPh4qpys+qm4DAYtUyryaTDg9zris+AczXyws=

vendor/modules.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ kernel.org/pub/linux/libs/security/libcap/psx
11251125
## explicit; go 1.12
11261126
sigs.k8s.io/yaml
11271127
sigs.k8s.io/yaml/goyaml.v2
1128-
# tags.cncf.io/container-device-interface v0.8.0
1128+
# tags.cncf.io/container-device-interface v0.8.1
11291129
## explicit; go 1.20
11301130
tags.cncf.io/container-device-interface/internal/validation
11311131
tags.cncf.io/container-device-interface/internal/validation/k8s

vendor/tags.cncf.io/container-device-interface/pkg/cdi/cache.go

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)