Move repository to atomix/consensusg

atomix · Oct 25, 2022 · 7540b9f · 7540b9f
1 parent a83bc90
commit 7540b9f
Show file tree

Hide file tree

Showing 16 changed files with 29 additions and 30 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-[![Controller](https://github.com/atomix/multi-raft-storage/actions/workflows/controller.yml/badge.svg)](https://github.com/atomix/multi-raft-storage/actions/workflows/controller.yml)
-[![Node](https://github.com/atomix/multi-raft-storage/actions/workflows/node.yml/badge.svg)](https://github.com/atomix/multi-raft-storage/actions/workflows/node.yml)
-[![Driver](https://github.com/atomix/multi-raft-storage/actions/workflows/driver.yml/badge.svg)](https://github.com/atomix/multi-raft-storage/actions/workflows/driver.yml)
+[![Controller](https://github.com/atomix/consensus/actions/workflows/controller.yml/badge.svg)](https://github.com/atomix/consensus/actions/workflows/controller.yml)
+[![Node](https://github.com/atomix/consensus/actions/workflows/node.yml/badge.svg)](https://github.com/atomix/consensus/actions/workflows/node.yml)
+[![Driver](https://github.com/atomix/consensus/actions/workflows/driver.yml/badge.svg)](https://github.com/atomix/consensus/actions/workflows/driver.yml)
 
 # MultiRaft Storage
 

diff --git a/controller/cmd/atomix-multi-raft-controller/main.go b/controller/cmd/atomix-multi-raft-controller/main.go
@@ -7,9 +7,9 @@ package main
 import (
 	"context"
 	"fmt"
-	multiraftapis "github.com/atomix/multi-raft-storage/controller/pkg/apis"
-	consensusv1beta1 "github.com/atomix/multi-raft-storage/controller/pkg/controller/consensus/v1beta1"
-	multiraftv3beta1 "github.com/atomix/multi-raft-storage/controller/pkg/controller/multiraft/v3beta1"
+	multiraftapis "github.com/atomix/consensus/controller/pkg/apis"
+	consensusv1beta1 "github.com/atomix/consensus/controller/pkg/controller/consensus/v1beta1"
+	multiraftv3beta1 "github.com/atomix/consensus/controller/pkg/controller/multiraft/v3beta1"
 	runtimeapis "github.com/atomix/runtime/controller/pkg/apis"
 	"github.com/atomix/runtime/controller/pkg/controller/util/k8s"
 	"github.com/atomix/runtime/sdk/pkg/logging"

diff --git a/controller/go.mod b/controller/go.mod
@@ -1,9 +1,9 @@
-module github.com/atomix/multi-raft-storage/controller
+module github.com/atomix/consensus/controller
 
 go 1.19
 
 require (
-	github.com/atomix/multi-raft-storage/node v0.9.1-0.20221022092257-69b86be8e3e0
+	github.com/atomix/consensus/node v0.9.1-0.20221022092257-69b86be8e3e0
 	github.com/atomix/runtime/controller v0.6.0
 	github.com/atomix/runtime/sdk v0.7.1
 	github.com/cenkalti/backoff v2.2.1+incompatible

diff --git a/controller/go.sum b/controller/go.sum
@@ -74,8 +74,8 @@ github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8
 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
-github.com/atomix/multi-raft-storage/node v0.9.1-0.20221022092257-69b86be8e3e0 h1:w6OYmEwabqgXZ23ZnA4WF+GosTAKNGyYFk0xsa0Jp78=
-github.com/atomix/multi-raft-storage/node v0.9.1-0.20221022092257-69b86be8e3e0/go.mod h1:dHd1EwFv5jk2J8dR1EhW5Rp4Z2abMTPZhRxtI7IBFKk=
+github.com/atomix/consensus/node v0.9.1-0.20221022092257-69b86be8e3e0 h1:w6OYmEwabqgXZ23ZnA4WF+GosTAKNGyYFk0xsa0Jp78=
+github.com/atomix/consensus/node v0.9.1-0.20221022092257-69b86be8e3e0/go.mod h1:dHd1EwFv5jk2J8dR1EhW5Rp4Z2abMTPZhRxtI7IBFKk=
 github.com/atomix/runtime/controller v0.6.0 h1:K8e/9pt4uneOGgNhh4+tkaoPYf8xx7QB6oKNnNAm71E=
 github.com/atomix/runtime/controller v0.6.0/go.mod h1:8UIKE/2LeuETaEYOZNSqEZWzA0TgDGeK5QYeZ/yoa20=
 github.com/atomix/runtime/sdk v0.7.1 h1:TbVHetojOWyEz8ORFKzU1L7MgQLz18ves+24fY+ytUg=

diff --git a/controller/pkg/apis/addtoscheme_consensus_v1beta1.go b/controller/pkg/apis/addtoscheme_consensus_v1beta1.go
@@ -5,7 +5,7 @@
 package apis
 
 import (
-	consensusv1beta1 "github.com/atomix/multi-raft-storage/controller/pkg/apis/consensus/v1beta1"
+	consensusv1beta1 "github.com/atomix/consensus/controller/pkg/apis/consensus/v1beta1"
 )
 
 func init() {

diff --git a/controller/pkg/apis/addtoscheme_multiraft_v3beta1.go b/controller/pkg/apis/addtoscheme_multiraft_v3beta1.go
@@ -5,7 +5,7 @@
 package apis
 
 import (
-	storagev2beta2 "github.com/atomix/multi-raft-storage/controller/pkg/apis/multiraft/v3beta1"
+	storagev2beta2 "github.com/atomix/consensus/controller/pkg/apis/multiraft/v3beta1"
 )
 
 func init() {

diff --git a/controller/pkg/apis/consensus/v1beta1/store.go b/controller/pkg/apis/consensus/v1beta1/store.go
@@ -5,7 +5,7 @@
 package v1beta1
 
 import (
-	"github.com/atomix/multi-raft-storage/controller/pkg/apis/multiraft/v3beta1"
+	"github.com/atomix/consensus/controller/pkg/apis/multiraft/v3beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 

diff --git a/controller/pkg/controller/consensus/v1beta1/store.go b/controller/pkg/controller/consensus/v1beta1/store.go
@@ -21,17 +21,17 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 	"time"
 
-	consensusv1beta1 "github.com/atomix/multi-raft-storage/controller/pkg/apis/consensus/v1beta1"
-	multiraftv3beta1 "github.com/atomix/multi-raft-storage/controller/pkg/apis/multiraft/v3beta1"
+	consensusv1beta1 "github.com/atomix/consensus/controller/pkg/apis/consensus/v1beta1"
+	multiraftv3beta1 "github.com/atomix/consensus/controller/pkg/apis/multiraft/v3beta1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
 const (
-	driverName    = "MultiRaft"
-	driverVersion = "v2beta1"
+	driverName    = "Consensus"
+	driverVersion = "v1beta1"
 )
 
 func addConsensusStoreController(mgr manager.Manager) error {

diff --git a/controller/pkg/controller/multiraft/v3beta1/cluster.go b/controller/pkg/controller/multiraft/v3beta1/cluster.go
@@ -7,10 +7,9 @@ package v3beta1
 import (
 	"context"
 	"fmt"
-	"github.com/atomix/multi-raft-storage/node/pkg/multiraft"
+	"github.com/atomix/consensus/node/pkg/multiraft"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
-	"gopkg.in/yaml.v3"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,7 +29,7 @@ import (
 	"strings"
 	"time"
 
-	multiraftv3beta1 "github.com/atomix/multi-raft-storage/controller/pkg/apis/multiraft/v3beta1"
+	multiraftv3beta1 "github.com/atomix/consensus/controller/pkg/apis/multiraft/v3beta1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/controller/pkg/controller/multiraft/v3beta1/watcher.go b/controller/pkg/controller/multiraft/v3beta1/watcher.go
@@ -7,7 +7,7 @@ package v3beta1
 import (
 	"context"
 	"fmt"
-	"github.com/atomix/multi-raft-storage/node/pkg/multiraft"
+	"github.com/atomix/consensus/node/pkg/multiraft"
 	"github.com/atomix/runtime/sdk/pkg/errors"
 	"github.com/atomix/runtime/sdk/pkg/grpc/retry"
 	"github.com/cenkalti/backoff"
@@ -27,7 +27,7 @@ import (
 	"sync"
 	"time"
 
-	multiraftv3beta1 "github.com/atomix/multi-raft-storage/controller/pkg/apis/multiraft/v3beta1"
+	multiraftv3beta1 "github.com/atomix/consensus/controller/pkg/apis/multiraft/v3beta1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"

diff --git a/driver/driver.go b/driver/driver.go
@@ -11,8 +11,8 @@ import (
 )
 
 var driverID = runtime.DriverID{
-	Name:    "MultiRaft",
-	Version: "v2beta1",
+	Name:    "Consensus",
+	Version: "v1beta1",
 }
 
 func New(network network.Network) runtime.Driver {

diff --git a/driver/go.mod b/driver/go.mod
@@ -1,4 +1,4 @@
-module github.com/atomix/multi-raft-storage/driver
+module github.com/atomix/consensus/driver
 
 go 1.19
 

diff --git a/driver/plugin/plugin.go b/driver/plugin/plugin.go
@@ -5,7 +5,7 @@
 package main
 
 import (
-	"github.com/atomix/multi-raft-storage/driver"
+	"github.com/atomix/consensus/driver"
 	"github.com/atomix/runtime/sdk/pkg/network"
 )
 

diff --git a/node/Makefile b/node/Makefile
@@ -15,7 +15,7 @@ build: test
 
 .PHONY: test
 test:
-	CGO_ENABLED=1 go test -race github.com/atomix/multi-raft-storage/node/...
+	CGO_ENABLED=1 go test -race github.com/atomix/consensus/node/...
 
 .PHONY: release
 release: build
@@ -36,7 +36,7 @@ generate:
 	docker run -i \
 		-v `pwd`:/build \
 		atomix/codegen:go-latest \
-	    --proto-path ./pkg --go-path ./pkg --import-path github.com/atomix/multi-raft-storage/node/pkg
+	    --proto-path ./pkg --go-path ./pkg --import-path github.com/atomix/consensus/node/pkg
 
 reuse-tool: # @HELP install reuse if not present
 	command -v reuse || python3 -m pip install reuse

diff --git a/node/cmd/atomix-multi-raft-node/main.go b/node/cmd/atomix-multi-raft-node/main.go
@@ -6,7 +6,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/atomix/multi-raft-storage/node/pkg/multiraft"
+	"github.com/atomix/consensus/node/pkg/multiraft"
 	counterv1 "github.com/atomix/runtime/primitives/pkg/counter/v1"
 	countermapv1 "github.com/atomix/runtime/primitives/pkg/countermap/v1"
 	electionv1 "github.com/atomix/runtime/primitives/pkg/election/v1"

diff --git a/node/go.mod b/node/go.mod
@@ -1,4 +1,4 @@
-module github.com/atomix/multi-raft-storage/node
+module github.com/atomix/consensus/node
 
 go 1.19