[release/0.12] vendor: github.com/containerd/containerd v17.18 #2186
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kiashok
approved these changes
Jun 26, 2024
|
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 😅 |
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. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
force-pushed
the
0.12_fix_containerd_version
branch
from
050bf9d to
43f9a69
Compare
|
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 |
|
Thanks! All green now 🎉 |
anmaxvl
approved these changes
Jul 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.