search

microsoft / hcsshim

Windows - Host Compute Service Shim
MIT License
564 stars 253 forks source link

[release/0.12] vendor: github.com/containerd/containerd v17.18 #2186

Closed thaJeztah closed 1 month ago

thaJeztah commented 2 months ago

Update to the current v1.7 release, which deprecated the errdefs and log packages in favor of the separate github.com/containerd/errdefs and github.com/containerd/log modules, which are now an alias.

Update the minimum required version to prevent consumers from using an older version, and thus incompatible errdefs or log definitions.

thaJeztah commented 2 months ago

cc @kiashok @dmcgowan

thaJeztah commented 2 months ago

Oh! Looks like protos had to be rebuilt as they contain the version string.

I'm not near a computer for the evening but feel free to push to my branch 😅


  diff --git a/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go b/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go
  index 34de2f1..8fe11c0 100644
  --- a/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go
  +++ b/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go
  @@ -1,6 +1,6 @@
   // Code generated by protoc-gen-go. DO NOT EDIT.
   // versions:
  -//   protoc-gen-go v1.32.0
  +//   protoc-gen-go v1.33.0
   //   protoc        v4.23.2
   // source: github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats/stats.proto
thaJeztah commented 2 months ago

Re-generated the protos; @kiashok can you restart CI?

diff --git a/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go b/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
index 48a1f8d9..48b609ab 100644
--- a/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
+++ b/cmd/containerd-shim-runhcs-v1/options/runhcs.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // source: github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options/runhcs.proto

diff --git a/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go b/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go
index 34de2f15..8fe11c07 100644
--- a/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go
+++ b/cmd/containerd-shim-runhcs-v1/stats/stats.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // source: github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/stats/stats.proto

diff --git a/internal/computeagent/computeagent.pb.go b/internal/computeagent/computeagent.pb.go
index 86b5b743..02dbfb25 100644
--- a/internal/computeagent/computeagent.pb.go
+++ b/internal/computeagent/computeagent.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // source: github.com/Microsoft/hcsshim/internal/computeagent/computeagent.proto

diff --git a/internal/extendedtask/extendedtask.pb.go b/internal/extendedtask/extendedtask.pb.go
index e9e6b90f..e168b42a 100644
--- a/internal/extendedtask/extendedtask.pb.go
+++ b/internal/extendedtask/extendedtask.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // source: github.com/Microsoft/hcsshim/internal/extendedtask/extendedtask.proto

diff --git a/internal/ncproxyttrpc/networkconfigproxy.pb.go b/internal/ncproxyttrpc/networkconfigproxy.pb.go
index 7a632a7e..da96a2c1 100644
--- a/internal/ncproxyttrpc/networkconfigproxy.pb.go
+++ b/internal/ncproxyttrpc/networkconfigproxy.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // source: github.com/Microsoft/hcsshim/internal/ncproxyttrpc/networkconfigproxy.proto

diff --git a/internal/shimdiag/shimdiag.pb.go b/internal/shimdiag/shimdiag.pb.go
index e557a106..e518910c 100644
--- a/internal/shimdiag/shimdiag.pb.go
+++ b/internal/shimdiag/shimdiag.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // source: github.com/Microsoft/hcsshim/internal/shimdiag/shimdiag.proto

diff --git a/internal/vmservice/vmservice.pb.go b/internal/vmservice/vmservice.pb.go
index 0dede7a8..745c6bdc 100644
--- a/internal/vmservice/vmservice.pb.go
+++ b/internal/vmservice/vmservice.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // source: github.com/Microsoft/hcsshim/internal/vmservice/vmservice.proto

diff --git a/pkg/ncproxy/ncproxygrpc/v0/networkconfigproxy.pb.go b/pkg/ncproxy/ncproxygrpc/v0/networkconfigproxy.pb.go
index ca8e338f..de2bce3f 100644
--- a/pkg/ncproxy/ncproxygrpc/v0/networkconfigproxy.pb.go
+++ b/pkg/ncproxy/ncproxygrpc/v0/networkconfigproxy.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v0/networkconfigproxy.proto is a deprecated file.

diff --git a/pkg/ncproxy/ncproxygrpc/v1/networkconfigproxy.pb.go b/pkg/ncproxy/ncproxygrpc/v1/networkconfigproxy.pb.go
index fa9beae3..e72f5be1 100644
--- a/pkg/ncproxy/ncproxygrpc/v1/networkconfigproxy.pb.go
+++ b/pkg/ncproxy/ncproxygrpc/v1/networkconfigproxy.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // source: github.com/Microsoft/hcsshim/pkg/ncproxy/ncproxygrpc/v1/networkconfigproxy.proto

diff --git a/pkg/ncproxy/nodenetsvc/v0/nodenetsvc.pb.go b/pkg/ncproxy/nodenetsvc/v0/nodenetsvc.pb.go
index c174af80..cc73d24f 100644
--- a/pkg/ncproxy/nodenetsvc/v0/nodenetsvc.pb.go
+++ b/pkg/ncproxy/nodenetsvc/v0/nodenetsvc.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // github.com/Microsoft/hcsshim/pkg/ncproxy/nodenetsvc/v0/nodenetsvc.proto is a deprecated file.

diff --git a/pkg/ncproxy/nodenetsvc/v1/nodenetsvc.pb.go b/pkg/ncproxy/nodenetsvc/v1/nodenetsvc.pb.go
index 3bd033f6..f521fca8 100644
--- a/pkg/ncproxy/nodenetsvc/v1/nodenetsvc.pb.go
+++ b/pkg/ncproxy/nodenetsvc/v1/nodenetsvc.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-//     protoc-gen-go v1.32.0
+//     protoc-gen-go v1.33.0
 //     protoc        v4.23.2
 // source: github.com/Microsoft/hcsshim/pkg/ncproxy/nodenetsvc/v1/nodenetsvc.proto
thaJeztah commented 2 months ago

Thanks! All green now 🎉