workspace: rules_go, gazelle, go, gVisor update
This commit not only updates rules_go and friends, but also updates
gVisor, removes legacy protobuf usage and switches from using
build_configuration to a config flag for bazel
Change-Id: Idb383f35ca0fec4cb7329e9d991f08f28cf9b1fb
Reviewed-on: https://review.monogon.dev/c/monogon/+/2129
Tested-by: Jenkins CI
Reviewed-by: Lorenz Brun <lorenz@monogon.tech>
diff --git a/metropolis/node/build/fsspec/BUILD.bazel b/metropolis/node/build/fsspec/BUILD.bazel
index 49ff9a0..eeddda7 100644
--- a/metropolis/node/build/fsspec/BUILD.bazel
+++ b/metropolis/node/build/fsspec/BUILD.bazel
@@ -14,7 +14,7 @@
embed = [":fsspec_go_proto"],
importpath = "source.monogon.dev/metropolis/node/build/fsspec",
visibility = ["//visibility:public"],
- deps = ["@com_github_golang_protobuf//proto:go_default_library"],
+ deps = ["@org_golang_google_protobuf//encoding/prototext"],
)
go_proto_library(
diff --git a/metropolis/node/build/fsspec/utils.go b/metropolis/node/build/fsspec/utils.go
index 2438220..c51df06 100644
--- a/metropolis/node/build/fsspec/utils.go
+++ b/metropolis/node/build/fsspec/utils.go
@@ -4,7 +4,7 @@
"fmt"
"os"
- "github.com/golang/protobuf/proto"
+ "google.golang.org/protobuf/encoding/prototext"
)
// ReadMergeSpecs reads FSSpecs from all files in paths and merges them into
@@ -18,7 +18,7 @@
}
var spec FSSpec
- if err := proto.UnmarshalText(string(specRaw), &spec); err != nil {
+ if err := prototext.Unmarshal(specRaw, &spec); err != nil {
return nil, fmt.Errorf("failed to parse spec %q: %w", p, err)
}
for _, f := range spec.File {
diff --git a/metropolis/node/core/curator/BUILD.bazel b/metropolis/node/core/curator/BUILD.bazel
index 0e91e0e..302579f 100644
--- a/metropolis/node/core/curator/BUILD.bazel
+++ b/metropolis/node/core/curator/BUILD.bazel
@@ -42,9 +42,9 @@
"@com_github_google_cel_go//checker/decls:go_default_library",
"@com_github_google_cel_go//common/types:go_default_library",
"@com_zx2c4_golang_wireguard_wgctrl//wgtypes",
- "@go_googleapis//google/api/expr/v1alpha1:expr_go_proto",
"@io_etcd_go_etcd_client_v3//:client",
"@io_etcd_go_etcd_client_v3//concurrency",
+ "@org_golang_google_genproto//googleapis/api/expr/v1alpha1",
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//keepalive",
diff --git a/metropolis/node/kubernetes/BUILD.bazel b/metropolis/node/kubernetes/BUILD.bazel
index cbad367..f888a57 100644
--- a/metropolis/node/kubernetes/BUILD.bazel
+++ b/metropolis/node/kubernetes/BUILD.bazel
@@ -39,7 +39,6 @@
"//metropolis/pkg/supervisor",
"//metropolis/proto/api",
"@com_github_container_storage_interface_spec//lib/go/csi",
- "@io_bazel_rules_go//proto/wkt:wrappers_go_proto",
"@io_k8s_api//core/v1:core",
"@io_k8s_api//storage/v1:storage",
"@io_k8s_apimachinery//pkg/api/errors",
@@ -60,6 +59,7 @@
"@org_golang_google_grpc//:go_default_library",
"@org_golang_google_grpc//codes",
"@org_golang_google_grpc//status",
+ "@org_golang_google_protobuf//types/known/wrapperspb",
"@org_golang_x_sys//unix",
],
)
diff --git a/metropolis/node/kubernetes/csi.go b/metropolis/node/kubernetes/csi.go
index e9f2ffa..ab9549d 100644
--- a/metropolis/node/kubernetes/csi.go
+++ b/metropolis/node/kubernetes/csi.go
@@ -25,11 +25,11 @@
"regexp"
"github.com/container-storage-interface/spec/lib/go/csi"
- "github.com/golang/protobuf/ptypes/wrappers"
"golang.org/x/sys/unix"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
+ "google.golang.org/protobuf/types/known/wrapperspb"
"k8s.io/kubelet/pkg/apis/pluginregistration/v1"
"source.monogon.dev/metropolis/node/core/localstorage"
@@ -279,7 +279,7 @@
}
func (s *csiPluginServer) Probe(ctx context.Context, req *csi.ProbeRequest) (*csi.ProbeResponse, error) {
- return &csi.ProbeResponse{Ready: &wrappers.BoolValue{Value: true}}, nil
+ return &csi.ProbeResponse{Ready: &wrapperspb.BoolValue{Value: true}}, nil
}
// Registration endpoints
diff --git a/metropolis/pkg/scsi/BUILD.bazel b/metropolis/pkg/scsi/BUILD.bazel
index f307a97..9c00b26 100644
--- a/metropolis/pkg/scsi/BUILD.bazel
+++ b/metropolis/pkg/scsi/BUILD.bazel
@@ -10,7 +10,6 @@
"scsi.go",
"scsi_linux.go",
"scsi_linux_defs.go",
- "scsi_linux_defs1.go",
"sensekeydata.go",
],
cgo = True,
diff --git a/metropolis/pkg/tpm/BUILD.bazel b/metropolis/pkg/tpm/BUILD.bazel
index 4873a82..76bb8bd 100644
--- a/metropolis/pkg/tpm/BUILD.bazel
+++ b/metropolis/pkg/tpm/BUILD.bazel
@@ -12,11 +12,11 @@
"//metropolis/pkg/logtree",
"//metropolis/pkg/sysfs",
"//metropolis/pkg/tpm/proto",
- "@com_github_golang_protobuf//proto:go_default_library",
"@com_github_google_go_tpm//tpm2",
"@com_github_google_go_tpm//tpmutil",
"@com_github_google_go_tpm_tools//client",
"@com_github_pkg_errors//:errors",
+ "@org_golang_google_protobuf//proto",
"@org_golang_x_crypto//nacl/secretbox",
"@org_golang_x_sys//unix",
],
diff --git a/metropolis/pkg/tpm/tpm.go b/metropolis/pkg/tpm/tpm.go
index 2a3f67a..7d45036 100644
--- a/metropolis/pkg/tpm/tpm.go
+++ b/metropolis/pkg/tpm/tpm.go
@@ -31,17 +31,18 @@
"sync"
"time"
- "github.com/golang/protobuf/proto"
tpm2tools "github.com/google/go-tpm-tools/client"
"github.com/google/go-tpm/tpm2"
"github.com/google/go-tpm/tpmutil"
"github.com/pkg/errors"
"golang.org/x/crypto/nacl/secretbox"
"golang.org/x/sys/unix"
+ "google.golang.org/protobuf/proto"
+
+ tpmpb "source.monogon.dev/metropolis/pkg/tpm/proto"
"source.monogon.dev/metropolis/pkg/logtree"
"source.monogon.dev/metropolis/pkg/sysfs"
- tpmpb "source.monogon.dev/metropolis/pkg/tpm/proto"
)
var (