Skip to content

Commit 490ecd3

Browse files
committed
Update deprecated fields; regenerate proto files
Signed-off-by: Hamza El-Saawy <hamzaelsaawy@microsoft.com>
1 parent 31913e1 commit 490ecd3

File tree

13 files changed

+17
-17
lines changed

13 files changed

+17
-17
lines changed

cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/containerd-shim-runhcs-v1/stats/stats.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ require (
9090
github.com/moby/sys/mountinfo v0.7.2 // indirect
9191
github.com/moby/sys/userns v0.1.0 // indirect
9292
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
93-
github.com/opencontainers/cgroups v0.0.1 // indirect
9493
github.com/opencontainers/go-digest v1.0.0 // indirect
9594
github.com/opencontainers/image-spec v1.1.1 // indirect
9695
github.com/prometheus/client_golang v1.22.0 // indirect

internal/computeagent/computeagent.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/extendedtask/extendedtask.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/guest/spec/spec_devices.go

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"strings"
1111
"time"
1212

13+
"github.com/opencontainers/cgroups/devices/config"
1314
"github.com/opencontainers/runc/libcontainer/devices"
1415
oci "github.com/opencontainers/runtime-spec/specs-go"
1516
"github.com/pkg/errors"
@@ -72,7 +73,7 @@ func AddAssignedDevice(ctx context.Context, spec *oci.Spec) error {
7273

7374
// devicePathsFromPCIPath takes a sysfs bus path to the pci device assigned into the guest
7475
// and attempts to find the dev nodes in the guest that map to it.
75-
func devicePathsFromPCIPath(ctx context.Context, pciPath string) ([]*devices.Device, error) {
76+
func devicePathsFromPCIPath(ctx context.Context, pciPath string) ([]*config.Device, error) {
7677
// get the full pci path to make sure that it's the final path
7778
pciFullPath, err := filepath.EvalSymlinks(pciPath)
7879
if err != nil {
@@ -87,7 +88,7 @@ func devicePathsFromPCIPath(ctx context.Context, pciPath string) ([]*devices.Dev
8788
}
8889

8990
// some drivers create multiple dev nodes associated with the PCI device
90-
out := []*devices.Device{}
91+
out := []*config.Device{}
9192

9293
// get all host dev devices
9394
hostDevices, err := devices.HostDevices()
@@ -104,9 +105,9 @@ func devicePathsFromPCIPath(ctx context.Context, pciPath string) ([]*devices.Dev
104105

105106
deviceTypeString := ""
106107
switch d.Type {
107-
case devices.BlockDevice:
108+
case config.BlockDevice:
108109
deviceTypeString = blockType
109-
case devices.CharDevice:
110+
case config.CharDevice:
110111
deviceTypeString = charType
111112
default:
112113
return nil, errors.New("unsupported device type")
@@ -139,7 +140,7 @@ func devicePathsFromPCIPath(ctx context.Context, pciPath string) ([]*devices.Dev
139140
}
140141
}
141142

142-
func AddLinuxDeviceToSpec(ctx context.Context, hostDevice *devices.Device, spec *oci.Spec, addCgroupDevice bool) {
143+
func AddLinuxDeviceToSpec(ctx context.Context, hostDevice *config.Device, spec *oci.Spec, addCgroupDevice bool) {
143144
rd := oci.LinuxDevice{
144145
Path: hostDevice.Path,
145146
Type: string(hostDevice.Type),

internal/ncproxyttrpc/networkconfigproxy.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/shimdiag/shimdiag.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/vmservice/vmservice.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/ncproxy/ncproxygrpc/v0/networkconfigproxy.pb.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)