Encode Generic ConfigBody as JSON

.github/workflows/ci.yml

@@ -587,7 +587,7 @@ jobs:
       matrix:
         box:
           - fedora/39-cloud-base
-          - rockylinux/8@8.0.0
+          - rockylinux/8@9.0.0
     env:
       BOX: ${{ matrix.box }}
 

.github/workflows/links.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: lycheeverse/[email protected].1
+      - uses: lycheeverse/[email protected].3
         with:
           # Fail action on broken links
           fail: true

.mailmap

@@ -18,6 +18,7 @@ Arnaud Porterie <[email protected]>
 Arnaud Porterie <[email protected]> <[email protected]>
 Bob Mader <[email protected]>
 Boris Popovschi <[email protected]>
+bot <49699333+dependabot[bot]@users.noreply.github.com>
 Bowen Yan <[email protected]>
 Brent Baude <[email protected]>
 Cao Zhihao <[email protected]>
@@ -54,7 +55,8 @@ haoyun <[email protected]>
 Harry Zhang <[email protected]> <[email protected]>
 Hu Shuai <[email protected]>
 Hu Shuai <[email protected]> <[email protected]>
-Iceber Gu <[email protected]>
+Iceber Gu <[email protected]>
+Iceber Gu <[email protected]> <[email protected]>
 Jaana Burcu Dogan <[email protected]> <[email protected]>
 Jess Valarezo <[email protected]>
 Jess Valarezo <[email protected]> <[email protected]>
@@ -177,3 +179,4 @@ Zhoulin Xie <[email protected]>
 Zhoulin Xie <[email protected]> <[email protected]>
 zounengren <[email protected]> <[email protected]>
 张潇 <[email protected]>
+张钰 <[email protected]>

RELEASES.md

@@ -461,6 +461,25 @@ version = 2
 
 </p></details>
 
+## Other breaking changes
+### containerd v2.0
+#### CRI plugin treats read-only mounts recursively read-only
+Starting with containerd v2.0, the CRI plugin treats read-only mounts
+as recursively read-only mounts when running on Linux kernel v5.12 or later.
+
+To rollback to the legacy behavior that corresponds to containerd v1.x,
+set the following config:
+```toml
+version = 2
+[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
+  # treat_ro_mounts_as_rro ("Enabled"|"IfPossible"|"Disabled")
+  # treats read-only mounts as recursive read-only mounts.
+  # An empty string means "IfPossible".
+  # "Enabled" requires Linux kernel v5.12 or later.
+  # This configuration does not apply to non-volume mounts such as "/sys/fs/cgroup".
+  treat_ro_mounts_as_rro = "Disabled"
+```
+
 ## Experimental features
 
 Experimental features are new features added to containerd which do not have the

api/Protobuild.toml

@@ -24,7 +24,7 @@ generators = ["go", "go-ttrpc", "go-fieldpath"]
 
 [[overrides]]
 prefixes = ["github.com/containerd/containerd/api/services/ttrpc/events/v1"]
-generators = ["go", "go-ttrpc", "go-fieldpath"]
+generators = ["go", "go-ttrpc"]
 
 [[overrides]]
 # enable ttrpc and disable fieldpath and grpc for the shim

api/next.pb.txt

@@ -3962,13 +3962,59 @@ file {
   }
   syntax: "proto3"
 }
+file {
+  name: "github.com/containerd/containerd/api/types/event.proto"
+  package: "containerd.types"
+  dependency: "github.com/containerd/containerd/api/types/fieldpath.proto"
+  dependency: "google/protobuf/any.proto"
+  dependency: "google/protobuf/timestamp.proto"
+  message_type {
+    name: "Envelope"
+    field {
+      name: "timestamp"
+      number: 1
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".google.protobuf.Timestamp"
+      json_name: "timestamp"
+    }
+    field {
+      name: "namespace"
+      number: 2
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "namespace"
+    }
+    field {
+      name: "topic"
+      number: 3
+      label: LABEL_OPTIONAL
+      type: TYPE_STRING
+      json_name: "topic"
+    }
+    field {
+      name: "event"
+      number: 4
+      label: LABEL_OPTIONAL
+      type: TYPE_MESSAGE
+      type_name: ".google.protobuf.Any"
+      json_name: "event"
+    }
+    options {
+      64400: 1
+    }
+  }
+  options {
+    go_package: "github.com/containerd/containerd/v2/api/types;types"
+  }
+  syntax: "proto3"
+}
 file {
   name: "github.com/containerd/containerd/api/services/events/v1/events.proto"
   package: "containerd.services.events.v1"
-  dependency: "github.com/containerd/containerd/api/types/fieldpath.proto"
+  dependency: "github.com/containerd/containerd/api/types/event.proto"
   dependency: "google/protobuf/any.proto"
   dependency: "google/protobuf/empty.proto"
-  dependency: "google/protobuf/timestamp.proto"
   message_type {
     name: "PublishRequest"
     field {
@@ -3994,7 +4040,7 @@ file {
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_MESSAGE
-      type_name: ".containerd.services.events.v1.Envelope"
+      type_name: ".containerd.types.Envelope"
       json_name: "envelope"
     }
   }
@@ -4008,42 +4054,6 @@ file {
       json_name: "filters"
     }
   }
-  message_type {
-    name: "Envelope"
-    field {
-      name: "timestamp"
-      number: 1
-      label: LABEL_OPTIONAL
-      type: TYPE_MESSAGE
-      type_name: ".google.protobuf.Timestamp"
-      json_name: "timestamp"
-    }
-    field {
-      name: "namespace"
-      number: 2
-      label: LABEL_OPTIONAL
-      type: TYPE_STRING
-      json_name: "namespace"
-    }
-    field {
-      name: "topic"
-      number: 3
-      label: LABEL_OPTIONAL
-      type: TYPE_STRING
-      json_name: "topic"
-    }
-    field {
-      name: "event"
-      number: 4
-      label: LABEL_OPTIONAL
-      type: TYPE_MESSAGE
-      type_name: ".google.protobuf.Any"
-      json_name: "event"
-    }
-    options {
-      64400: 1
-    }
-  }
   service {
     name: "Events"
     method {
@@ -4059,7 +4069,7 @@ file {
     method {
       name: "Subscribe"
       input_type: ".containerd.services.events.v1.SubscribeRequest"
-      output_type: ".containerd.services.events.v1.Envelope"
+      output_type: ".containerd.types.Envelope"
       server_streaming: true
     }
   }
@@ -7070,57 +7080,19 @@ file {
 file {
   name: "github.com/containerd/containerd/api/services/ttrpc/events/v1/events.proto"
   package: "containerd.services.events.ttrpc.v1"
-  dependency: "github.com/containerd/containerd/api/types/fieldpath.proto"
-  dependency: "google/protobuf/any.proto"
+  dependency: "github.com/containerd/containerd/api/types/event.proto"
   dependency: "google/protobuf/empty.proto"
-  dependency: "google/protobuf/timestamp.proto"
   message_type {
     name: "ForwardRequest"
     field {
       name: "envelope"
       number: 1
       label: LABEL_OPTIONAL
       type: TYPE_MESSAGE
-      type_name: ".containerd.services.events.ttrpc.v1.Envelope"
+      type_name: ".containerd.types.Envelope"
       json_name: "envelope"
     }
   }
-  message_type {
-    name: "Envelope"
-    field {
-      name: "timestamp"
-      number: 1
-      label: LABEL_OPTIONAL
-      type: TYPE_MESSAGE
-      type_name: ".google.protobuf.Timestamp"
-      json_name: "timestamp"
-    }
-    field {
-      name: "namespace"
-      number: 2
-      label: LABEL_OPTIONAL
-      type: TYPE_STRING
-      json_name: "namespace"
-    }
-    field {
-      name: "topic"
-      number: 3
-      label: LABEL_OPTIONAL
-      type: TYPE_STRING
-      json_name: "topic"
-    }
-    field {
-      name: "event"
-      number: 4
-      label: LABEL_OPTIONAL
-      type: TYPE_MESSAGE
-      type_name: ".google.protobuf.Any"
-      json_name: "event"
-    }
-    options {
-      64400: 1
-    }
-  }
   service {
     name: "Events"
     method {