treewide: switch to gomod and bump everything
This switches version resolution from fietsje to gomod and updates
all Go dependencies. It also bumps rules_go (required by gVisor) and
switches the Gazelle naming convention from go_default_xxx to the
standard Bazel convention of the default target having the package
name.
Since Kubernetes dropped upstream Bazel support and doesn't check in
all generated files I manually pregenerated the OpenAPI spec. This
should be fixed, but because of the already-huge scope of this CL
and the rebase complexity this is not in here.
Change-Id: Iec8ea613d06946882426c2f9fad5bda7e8aaf833
Reviewed-on: https://review.monogon.dev/c/monogon/+/639
Reviewed-by: Sergiusz Bazanski <serge@monogon.tech>
Reviewed-by: Leopold Schabel <leo@nexantic.com>
diff --git a/metropolis/pkg/event/BUILD.bazel b/metropolis/pkg/event/BUILD.bazel
index 0217c8a..92405ff 100644
--- a/metropolis/pkg/event/BUILD.bazel
+++ b/metropolis/pkg/event/BUILD.bazel
@@ -1,7 +1,7 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library")
go_library(
- name = "go_default_library",
+ name = "event",
srcs = ["event.go"],
importpath = "source.monogon.dev/metropolis/pkg/event",
visibility = ["//visibility:public"],
diff --git a/metropolis/pkg/event/etcd/BUILD.bazel b/metropolis/pkg/event/etcd/BUILD.bazel
index b00bc47..51ad5c1 100644
--- a/metropolis/pkg/event/etcd/BUILD.bazel
+++ b/metropolis/pkg/event/etcd/BUILD.bazel
@@ -1,28 +1,29 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "etcd",
srcs = ["etcd.go"],
importpath = "source.monogon.dev/metropolis/pkg/event/etcd",
visibility = ["//visibility:public"],
deps = [
- "//metropolis/node/core/consensus/client:go_default_library",
- "//metropolis/pkg/event:go_default_library",
- "@com_github_cenkalti_backoff_v4//:go_default_library",
- "@io_etcd_go_etcd//clientv3:go_default_library",
+ "//metropolis/node/core/consensus/client",
+ "//metropolis/pkg/event",
+ "@com_github_cenkalti_backoff_v4//:backoff",
+ "@io_etcd_go_etcd_client_v3//:client",
],
)
go_test(
- name = "go_default_test",
+ name = "etcd_test",
srcs = ["etcd_test.go"],
- embed = [":go_default_library"],
+ embed = [":etcd"],
deps = [
- "//metropolis/node/core/consensus/client:go_default_library",
- "//metropolis/pkg/event:go_default_library",
- "@io_etcd_go_etcd//clientv3:go_default_library",
- "@io_etcd_go_etcd//etcdserver/api/v3rpc/rpctypes:go_default_library",
- "@io_etcd_go_etcd//integration:go_default_library",
- "@org_golang_google_grpc//codes:go_default_library",
+ "//metropolis/node/core/consensus/client",
+ "//metropolis/pkg/event",
+ "@io_etcd_go_etcd_api_v3//v3rpc/rpctypes",
+ "@io_etcd_go_etcd_client_pkg_v3//testutil",
+ "@io_etcd_go_etcd_client_v3//:client",
+ "@io_etcd_go_etcd_tests_v3//integration",
+ "@org_golang_google_grpc//codes",
],
)
diff --git a/metropolis/pkg/event/etcd/etcd.go b/metropolis/pkg/event/etcd/etcd.go
index 7b914f7..cb93325 100644
--- a/metropolis/pkg/event/etcd/etcd.go
+++ b/metropolis/pkg/event/etcd/etcd.go
@@ -7,7 +7,7 @@
"sync"
"github.com/cenkalti/backoff/v4"
- "go.etcd.io/etcd/clientv3"
+ clientv3 "go.etcd.io/etcd/client/v3"
"source.monogon.dev/metropolis/node/core/consensus/client"
"source.monogon.dev/metropolis/pkg/event"
diff --git a/metropolis/pkg/event/etcd/etcd_test.go b/metropolis/pkg/event/etcd/etcd_test.go
index 4b620c0..faa9629 100644
--- a/metropolis/pkg/event/etcd/etcd_test.go
+++ b/metropolis/pkg/event/etcd/etcd_test.go
@@ -3,6 +3,7 @@
import (
"context"
"errors"
+ "flag"
"fmt"
"log"
"os"
@@ -11,9 +12,10 @@
"testing"
"time"
- "go.etcd.io/etcd/clientv3"
- "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
- "go.etcd.io/etcd/integration"
+ "go.etcd.io/etcd/api/v3/v3rpc/rpctypes"
+ "go.etcd.io/etcd/client/pkg/v3/testutil"
+ clientv3 "go.etcd.io/etcd/client/v3"
+ "go.etcd.io/etcd/tests/v3/integration"
"google.golang.org/grpc/codes"
"source.monogon.dev/metropolis/node/core/consensus/client"
@@ -31,14 +33,18 @@
Size: 3,
GRPCKeepAliveMinTime: time.Millisecond,
}
- cluster = integration.NewClusterV3(nil, &cfg)
+ tb, cancel := testutil.NewTestingTBProthesis("curator")
+ defer cancel()
+ flag.Parse()
+ integration.BeforeTest(tb)
+ cluster = integration.NewClusterV3(tb, &cfg)
endpoints = make([]string, 3)
for i := range endpoints {
endpoints[i] = cluster.Client(i).Endpoints()[0]
}
v := m.Run()
- cluster.Terminate(nil)
+ cluster.Terminate(tb)
os.Exit(v)
}
diff --git a/metropolis/pkg/event/memory/BUILD.bazel b/metropolis/pkg/event/memory/BUILD.bazel
index 4ba79d2..da07dc3 100644
--- a/metropolis/pkg/event/memory/BUILD.bazel
+++ b/metropolis/pkg/event/memory/BUILD.bazel
@@ -1,19 +1,19 @@
load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
go_library(
- name = "go_default_library",
+ name = "memory",
srcs = ["memory.go"],
importpath = "source.monogon.dev/metropolis/pkg/event/memory",
visibility = ["//visibility:public"],
- deps = ["//metropolis/pkg/event:go_default_library"],
+ deps = ["//metropolis/pkg/event"],
)
go_test(
- name = "go_default_test",
+ name = "memory_test",
srcs = [
"example_test.go",
"memory_test.go",
],
- embed = [":go_default_library"],
- deps = ["//metropolis/pkg/event:go_default_library"],
+ embed = [":memory"],
+ deps = ["//metropolis/pkg/event"],
)