Merge pull request #6841 from kzys/proto-upgrade-6

Migrate off from github.com/gogo/protobuf

pkg/cri/server/container_stats_list.go

@@ -36,7 +36,7 @@ func (c *criService) ListContainerStats(
 	if err != nil {
 		return nil, fmt.Errorf("failed to build metrics request: %w", err)
 	}
-	resp, err := c.client.TaskService().Metrics(ctx, &request)
+	resp, err := c.client.TaskService().Metrics(ctx, request)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch metrics for tasks: %w", err)
 	}
@@ -79,8 +79,8 @@ func (c *criService) normalizeContainerStatsFilter(filter *runtime.ContainerStat
 // the information in the stats request and the containerStore
 func (c *criService) buildTaskMetricsRequest(
 	r *runtime.ListContainerStatsRequest,
-) (tasks.MetricsRequest, []containerstore.Container, error) {
-	var req tasks.MetricsRequest
+) (*tasks.MetricsRequest, []containerstore.Container, error) {
+	req := &tasks.MetricsRequest{}
 	if r.GetFilter() == nil {
 		return req, c.containerStore.List(), nil
 	}

pkg/cri/server/events_test.go

@@ -21,7 +21,9 @@ import (
 	"time"
 
 	eventtypes "github.com/containerd/containerd/api/events"
+	"github.com/containerd/containerd/protobuf"
 	"github.com/containerd/typeurl"
+	"github.com/google/go-cmp/cmp"
 	"github.com/stretchr/testify/assert"
 	testingclock "k8s.io/utils/clock/testing"
 )
@@ -107,7 +109,7 @@ func TestBackOff(t *testing.T) {
 	for k := range inputQueues {
 		actQueue := actual.deBackOff(k)
 		doneQueues[k] = actQueue
-		assert.Equal(t, actQueue, expectedQueues[k])
+		assert.True(t, cmp.Equal(actQueue.events, expectedQueues[k].events, protobuf.Compare))
 	}
 
 	t.Logf("Should not get out the event again after having got out the backOff event")