Regenerate gRPC stubs with the latest protobuf

.gitignore

@@ -4,4 +4,5 @@ __pycache__
 *.pyc
 gubernator.egg-info/
 .DS_Store
-*.iml
+*.iml
+googleapis/

benchmark_test.go

@@ -20,8 +20,8 @@ import (
 	"context"
 	"testing"
 
-	guber "github.com/mailgun/gubernator"
-	"github.com/mailgun/gubernator/cluster"
+	guber "github.com/mailgun/gubernator/v2"
+	"github.com/mailgun/gubernator/v2/cluster"
 	"github.com/mailgun/holster/v4/syncutil"
 )
 

cluster/cluster.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"math/rand"
 
-	"github.com/mailgun/gubernator"
+	"github.com/mailgun/gubernator/v2"
 	"github.com/mailgun/holster/v4/clock"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"

cluster/cluster_test.go

@@ -19,8 +19,8 @@ package cluster_test
 import (
 	"testing"
 
-	"github.com/mailgun/gubernator"
-	"github.com/mailgun/gubernator/cluster"
+	"github.com/mailgun/gubernator/v2"
+	"github.com/mailgun/gubernator/v2/cluster"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

cmd/gubernator-cli/main.go

@@ -25,7 +25,7 @@ import (
 	"os"
 
 	"github.com/davecgh/go-spew/spew"
-	guber "github.com/mailgun/gubernator"
+	guber "github.com/mailgun/gubernator/v2"
 	"github.com/mailgun/holster/v4/clock"
 	"github.com/mailgun/holster/v4/setter"
 	"github.com/mailgun/holster/v4/syncutil"

cmd/gubernator-cluster/main.go

@@ -21,8 +21,8 @@ import (
 	"os"
 	"os/signal"
 
-	"github.com/mailgun/gubernator"
-	"github.com/mailgun/gubernator/cluster"
+	"github.com/mailgun/gubernator/v2"
+	"github.com/mailgun/gubernator/v2/cluster"
 	"github.com/sirupsen/logrus"
 )
 

cmd/gubernator/main.go

@@ -24,7 +24,7 @@ import (
 	"runtime"
 	"syscall"
 
-	"github.com/mailgun/gubernator"
+	"github.com/mailgun/gubernator/v2"
 	"github.com/mailgun/holster/v4/clock"
 	"github.com/sirupsen/logrus"
 	"k8s.io/klog"

functional_test.go

@@ -25,8 +25,8 @@ import (
 	"strings"
 	"testing"
 
-	guber "github.com/mailgun/gubernator"
-	"github.com/mailgun/gubernator/cluster"
+	guber "github.com/mailgun/gubernator/v2"
+	"github.com/mailgun/gubernator/v2/cluster"
 	"github.com/mailgun/holster/v4/clock"
 	"github.com/mailgun/holster/v4/testutil"
 	"github.com/prometheus/common/expfmt"

go.mod

@@ -1,12 +1,11 @@
-module github.com/mailgun/gubernator
+module github.com/mailgun/gubernator/v2
 
 go 1.14
 
 require (
 	github.com/davecgh/go-spew v1.1.1
-	github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 // indirect
 	github.com/golang/protobuf v1.5.2
-	github.com/google/btree v1.0.0 // indirect
+	github.com/google/go-cmp v0.5.6 // indirect
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/hashicorp/memberlist v0.2.4
 	github.com/mailgun/holster/v4 v4.0.0
@@ -18,9 +17,11 @@ require (
 	github.com/stretchr/testify v1.7.0
 	go.etcd.io/etcd/client/v3 v3.5.0
 	golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4
-	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect
-	google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c
+	golang.org/x/oauth2 v0.0.0-20210615190721-d04028783cf1 // indirect
+	google.golang.org/api v0.30.0
+	google.golang.org/genproto v0.0.0-20210617175327-b9e0b3197ced
 	google.golang.org/grpc v1.38.0
+	google.golang.org/protobuf v1.27.1 // indirect
 	k8s.io/api v0.0.0-20190620084959-7cf5895f2711
 	k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
 	k8s.io/client-go v0.0.0-20190620085101-78d2af792bab

gubernator.go

@@ -38,6 +38,8 @@ const (
 )
 
 type V1Instance struct {
+	UnimplementedV1Server
+	UnimplementedPeersV1Server
 	health      HealthCheckResp
 	global      *globalManager
 	mutliRegion *mutliRegionManager