Skip to content

Commit 14628d4

Browse files
elezarelezar
committed
Update container-device-interface to v0.6.2
This includes migrating from the github.com/container-orchestrated-devices repo to tags.cncf.io. Signed-off-by: Evan Lezar <[email protected]>
1 parent 8c780b7 commit 14628d4

37 files changed

Lines changed: 403 additions & 266 deletions

‎docs/cri/config.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -219,12 +219,12 @@ version = 2
219219

220220
# enable_cdi enables support of the Container Device Interface (CDI)
221221
# For more details about CDI and the syntax of CDI Spec files please refer to
222-
# https://github.com/container-orchestrated-devices/container-device-interface.
222+
# https://tags.cncf.io/container-device-interface.
223223
enable_cdi = false
224224

225225
# cdi_spec_dirs is the list of directories to scan for CDI spec files
226226
# For more details about CDI configuration please refer to
227-
# https://github.com/container-orchestrated-devices/container-device-interface#containerd-configuration
227+
# https://tags.cncf.io/container-device-interface#containerd-configuration
228228
cdi_spec_dirs = ["/etc/cdi", "/var/run/cdi"]
229229

230230
# drain_exec_sync_io_timeout is the maximum duration to wait for ExecSync API'

‎go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ require (
88
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0
99
github.com/Microsoft/go-winio v0.6.1
1010
github.com/Microsoft/hcsshim v0.11.4
11-
github.com/container-orchestrated-devices/container-device-interface v0.6.1
1211
github.com/containerd/aufs v1.0.0
1312
github.com/containerd/btrfs/v2 v2.0.0
1413
github.com/containerd/cgroups/v3 v3.0.2
@@ -81,6 +80,7 @@ require (
8180
k8s.io/cri-api v0.27.1
8281
k8s.io/klog/v2 v2.90.1
8382
k8s.io/utils v0.0.0-20230220204549-a5ecb0141aa5
83+
tags.cncf.io/container-device-interface v0.6.2
8484
)
8585

8686
require (
@@ -142,4 +142,5 @@ require (
142142
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
143143
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
144144
sigs.k8s.io/yaml v1.3.0 // indirect
145+
tags.cncf.io/container-device-interface/specs-go v0.6.0 // indirect
145146
)

‎go.sum‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,6 @@ github.com/cockroachdb/datadriven v0.0.0-20190809214429-80d97fb3cbaa/go.mod h1:z
180180
github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
181181
github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
182182
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
183-
github.com/container-orchestrated-devices/container-device-interface v0.6.1 h1:mz77uJoP8im/4Zins+mPqt677ZMaflhoGaYrRAl5jvA=
184-
github.com/container-orchestrated-devices/container-device-interface v0.6.1/go.mod h1:40T6oW59rFrL/ksiSs7q45GzjGlbvxnA4xaK6cyq+kA=
185183
github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
186184
github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
187185
github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
@@ -1677,3 +1675,7 @@ sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
16771675
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
16781676
sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
16791677
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
1678+
tags.cncf.io/container-device-interface v0.6.2 h1:dThE6dtp/93ZDGhqaED2Pu374SOeUkBfuvkLuiTdwzg=
1679+
tags.cncf.io/container-device-interface v0.6.2/go.mod h1:Shusyhjs1A5Na/kqPVLL0KqnHQHuunol9LFeUNkuGVE=
1680+
tags.cncf.io/container-device-interface/specs-go v0.6.0 h1:V+tJJN6dqu8Vym6p+Ru+K5mJ49WL6Aoc5SJFSY0RLsQ=
1681+
tags.cncf.io/container-device-interface/specs-go v0.6.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=

‎integration/client/go.sum‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,6 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWH
856856
github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo=
857857
github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA=
858858
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
859-
github.com/container-orchestrated-devices/container-device-interface v0.6.1/go.mod h1:40T6oW59rFrL/ksiSs7q45GzjGlbvxnA4xaK6cyq+kA=
860859
github.com/containerd/aufs v1.0.0/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=
861860
github.com/containerd/btrfs/v2 v2.0.0/go.mod h1:swkD/7j9HApWpzl8OHfrHNxppPd9l44DFZdF94BUj9k=
862861
github.com/containerd/cgroups v0.0.0-20200824123100-0b889c03f102/go.mod h1:s5q4SojHctfxANBDvMeIaIovkq29IP48TKAxnhYRxvo=
@@ -1435,6 +1434,7 @@ github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/
14351434
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
14361435
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
14371436
github.com/opencontainers/runtime-spec v1.0.3-0.20220825212826-86290f6a00fb/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
1437+
github.com/opencontainers/runtime-spec v1.0.3-0.20220909204839-494a5a6aca78/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
14381438
github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg=
14391439
github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
14401440
github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
@@ -2641,3 +2641,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.2.3/go.mod h1:qjx8mGObPmV2aSZepjQjbmb2ih
26412641
sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
26422642
sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
26432643
sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=
2644+
tags.cncf.io/container-device-interface v0.6.2/go.mod h1:Shusyhjs1A5Na/kqPVLL0KqnHQHuunol9LFeUNkuGVE=
2645+
tags.cncf.io/container-device-interface/specs-go v0.6.0/go.mod h1:hMAwAbMZyBLdmYqWgYcKH0F/yctNpV3P35f+/088A80=

‎pkg/cri/config/config.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,11 +362,11 @@ type PluginConfig struct {
362362
// EnableCDI indicates to enable injection of the Container Device Interface Specifications
363363
// into the OCI config
364364
// For more details about CDI and the syntax of CDI Spec files please refer to
365-
// https://github.com/container-orchestrated-devices/container-device-interface.
365+
// https://tags.cncf.io/container-device-interface.
366366
EnableCDI bool `toml:"enable_cdi" json:"enableCDI"`
367367
// CDISpecDirs is the list of directories to scan for Container Device Interface Specifications
368368
// For more details about CDI configuration please refer to
369-
// https://github.com/container-orchestrated-devices/container-device-interface#containerd-configuration
369+
// https://tags.cncf.io/container-device-interface#containerd-configuration
370370
CDISpecDirs []string `toml:"cdi_spec_dirs" json:"cdiSpecDirs"`
371371
// ImagePullProgressTimeout is the maximum duration that there is no
372372
// image data read from image registry in the open connection. It will

‎pkg/cri/opts/spec_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ import (
2626
"sync"
2727
"syscall"
2828

29-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
3029
"github.com/containerd/cgroups/v3"
3130
"github.com/sirupsen/logrus"
3231
"golang.org/x/sys/unix"
3332
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
33+
"tags.cncf.io/container-device-interface/pkg/cdi"
3434

3535
"github.com/containerd/containerd/containers"
3636
"github.com/containerd/containerd/log"

‎pkg/cri/sbserver/container_create_linux_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import (
2525
"strings"
2626
"testing"
2727

28-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
2928
"github.com/containerd/containerd/containers"
3029
"github.com/containerd/containerd/contrib/apparmor"
3130
"github.com/containerd/containerd/contrib/seccomp"
@@ -38,6 +37,7 @@ import (
3837
"github.com/stretchr/testify/assert"
3938
"github.com/stretchr/testify/require"
4039
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
40+
"tags.cncf.io/container-device-interface/pkg/cdi"
4141

4242
"github.com/containerd/containerd/pkg/cap"
4343
"github.com/containerd/containerd/pkg/cri/annotations"

‎pkg/cri/sbserver/service_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ package sbserver
1919
import (
2020
"fmt"
2121

22-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
2322
"github.com/containerd/containerd/pkg/cap"
2423
"github.com/containerd/containerd/pkg/userns"
2524
"github.com/containerd/go-cni"
2625
"github.com/opencontainers/selinux/go-selinux"
2726
"github.com/sirupsen/logrus"
27+
"tags.cncf.io/container-device-interface/pkg/cdi"
2828
)
2929

3030
// networkAttachCount is the minimum number of networks the PodSandbox

‎pkg/cri/server/container_create_linux_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ import (
2626
"strings"
2727
"testing"
2828

29-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
3029
"github.com/containerd/containerd/containers"
3130
"github.com/containerd/containerd/contrib/apparmor"
3231
"github.com/containerd/containerd/contrib/seccomp"
@@ -38,6 +37,7 @@ import (
3837
"github.com/stretchr/testify/assert"
3938
"github.com/stretchr/testify/require"
4039
runtime "k8s.io/cri-api/pkg/apis/runtime/v1"
40+
"tags.cncf.io/container-device-interface/pkg/cdi"
4141

4242
"github.com/containerd/containerd/pkg/cap"
4343
"github.com/containerd/containerd/pkg/cri/annotations"

‎pkg/cri/server/service_linux.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ package server
1919
import (
2020
"fmt"
2121

22-
"github.com/container-orchestrated-devices/container-device-interface/pkg/cdi"
2322
"github.com/containerd/containerd/pkg/cap"
2423
"github.com/containerd/containerd/pkg/userns"
2524
cni "github.com/containerd/go-cni"
2625
"github.com/opencontainers/selinux/go-selinux"
2726
"github.com/sirupsen/logrus"
27+
"tags.cncf.io/container-device-interface/pkg/cdi"
2828
)
2929

3030
// networkAttachCount is the minimum number of networks the PodSandbox

0 commit comments

Comments
 (0)