vendor of containers/(common, storage, image)

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>

vendor/github.com/containerd/cgroups/stats/v1/doc.go

@@ -14,4 +14,4 @@
    limitations under the License.
 */
 
-package stats
+package v1

vendor/github.com/containerd/cgroups/stats/v1/metrics.pb.txt

@@ -1,6 +1,7 @@
 file {
-  name: "github.com/containerd/cgroups/cgroup1/stats/metrics.proto"
+  name: "github.com/containerd/cgroups/stats/v1/metrics.proto"
   package: "io.containerd.cgroups.v1"
+  dependency: "gogoproto/gogo.proto"
   message_type {
     name: "Metrics"
     field {
@@ -25,6 +26,9 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_MESSAGE
       type_name: ".io.containerd.cgroups.v1.CPUStat"
+      options {
+        65004: "CPU"
+      }
       json_name: "cpu"
     }
     field {
@@ -171,6 +175,9 @@ file {
       number: 4
       label: LABEL_REPEATED
       type: TYPE_UINT64
+      options {
+        65004: "PerCPU"
+      }
       json_name: "perCpu"
     }
   }
@@ -212,6 +219,9 @@ file {
       number: 2
       label: LABEL_OPTIONAL
       type: TYPE_UINT64
+      options {
+        65004: "RSS"
+      }
       json_name: "rss"
     }
     field {
@@ -219,6 +229,9 @@ file {
       number: 3
       label: LABEL_OPTIONAL
       type: TYPE_UINT64
+      options {
+        65004: "RSSHuge"
+      }
       json_name: "rssHuge"
     }
     field {
@@ -331,6 +344,9 @@ file {
       number: 19
       label: LABEL_OPTIONAL
       type: TYPE_UINT64
+      options {
+        65004: "TotalRSS"
+      }
       json_name: "totalRss"
     }
     field {
@@ -338,6 +354,9 @@ file {
       number: 20
       label: LABEL_OPTIONAL
       type: TYPE_UINT64
+      options {
+        65004: "TotalRSSHuge"
+      }
       json_name: "totalRssHuge"
     }
     field {
@@ -454,6 +473,9 @@ file {
       label: LABEL_OPTIONAL
       type: TYPE_MESSAGE
       type_name: ".io.containerd.cgroups.v1.MemoryEntry"
+      options {
+        65004: "KernelTCP"
+      }
       json_name: "kernelTcp"
     }
   }
@@ -764,8 +786,5 @@ file {
       json_name: "nrIoWait"
     }
   }
-  options {
-    go_package: "github.com/containerd/cgroups/cgroup1/stats"
-  }
   syntax: "proto3"
 }

vendor/github.com/containerd/cgroups/stats/v1/metrics.proto

@@ -2,12 +2,12 @@ syntax = "proto3";
 
 package io.containerd.cgroups.v1;
 
-option go_package = "github.com/containerd/cgroups/cgroup1/stats";
+import "gogoproto/gogo.proto";
 
 message Metrics {
 	repeated HugetlbStat hugetlb = 1;
 	PidsStat pids = 2;
-	CPUStat cpu = 3;
+	CPUStat cpu = 3 [(gogoproto.customname) = "CPU"];
 	MemoryStat memory = 4;
 	BlkIOStat blkio = 5;
 	RdmaStat rdma = 6;
@@ -38,7 +38,7 @@ message CPUUsage {
 	uint64 total = 1;
 	uint64 kernel = 2;
 	uint64 user = 3;
-	repeated uint64 per_cpu = 4;
+	repeated uint64 per_cpu = 4 [(gogoproto.customname) = "PerCPU"];
 
 }
 
@@ -50,8 +50,8 @@ message Throttle {
 
 message MemoryStat {
 	uint64 cache = 1;
-	uint64 rss = 2;
-	uint64 rss_huge = 3;
+	uint64 rss = 2 [(gogoproto.customname) = "RSS"];
+	uint64 rss_huge = 3 [(gogoproto.customname) = "RSSHuge"];
 	uint64 mapped_file = 4;
 	uint64 dirty = 5;
 	uint64 writeback = 6;
@@ -67,8 +67,8 @@ message MemoryStat {
 	uint64 hierarchical_memory_limit = 16;
 	uint64 hierarchical_swap_limit = 17;
 	uint64 total_cache = 18;
-	uint64 total_rss = 19;
-	uint64 total_rss_huge = 20;
+	uint64 total_rss = 19 [(gogoproto.customname) = "TotalRSS"];
+	uint64 total_rss_huge = 20 [(gogoproto.customname) = "TotalRSSHuge"];
 	uint64 total_mapped_file = 21;
 	uint64 total_dirty = 22;
 	uint64 total_writeback = 23;
@@ -84,7 +84,7 @@ message MemoryStat {
 	MemoryEntry usage = 33;
 	MemoryEntry swap = 34;
 	MemoryEntry kernel = 35;
-	MemoryEntry kernel_tcp = 36;
+	MemoryEntry kernel_tcp = 36 [(gogoproto.customname) = "KernelTCP"];
 
 }