Re-generate protobuf and cleanup go.mod

projectcalico · Jul 9, 2024 · c2d63e5 · c2d63e5
1 parent f45d5bf
commit c2d63e5
Show file tree

Hide file tree

Showing 10 changed files with 517 additions and 302 deletions.
diff --git a/app-policy/proto/healthz.pb.go b/app-policy/proto/healthz.pb.go
diff --git a/app-policy/proto/healthz_grpc.pb.go b/app-policy/proto/healthz_grpc.pb.go
diff --git a/cni-plugin/pkg/dataplane/grpc/proto/cnibackend.pb.go b/cni-plugin/pkg/dataplane/grpc/proto/cnibackend.pb.go
diff --git a/cni-plugin/pkg/dataplane/grpc/proto/cnibackend_grpc.pb.go b/cni-plugin/pkg/dataplane/grpc/proto/cnibackend_grpc.pb.go
diff --git a/felix/k8sfv/k8sfv.go b/felix/k8sfv/k8sfv.go
@@ -14,26 +14,21 @@
 
 package main
 
-// XXX staticcheck disabled for the whole import as golangci-lint ignores
-// specific directives, still an open issue:
-// https://github.com/golangci/golangci-lint/issues/741
-//
-// SA1019 prometheus is using that lib and so need we
-// github.com/golang/protobuf/proto is deprecated and fails lint
-
-//nolint:staticcheck
 import (
 	"context"
 	"fmt"
 	"strings"
 	"time"
 
-	"github.com/golang/protobuf/proto"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/push"
 	log "github.com/sirupsen/logrus"
+
+	"google.golang.org/protobuf/proto"
+
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/client-go/tools/clientcmd/api"
@@ -133,7 +128,9 @@ var _ = AfterSuite(func() {
 	fmt.Println("")
 	for _, family := range metricFamilies {
 		if strings.HasPrefix(*family.Name, "k8sfv") {
-			fmt.Println(proto.MarshalTextString(family))
+			out, err := proto.Marshal(family)
+			panicIfError(err)
+			fmt.Println(string(out))
 		}
 	}
 })