Fix import paths in controller

atomix · Oct 28, 2022 · 2fac65f · 2fac65f
1 parent d630235
commit 2fac65f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/controller/cmd/atomix-consensus-controller/main.go b/controller/cmd/atomix-consensus-controller/main.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"fmt"
 	consensusapis "github.com/atomix/consensus-storage/controller/pkg/apis"
-	consensusv1beta1 "github.com/atomix/consensus-storage/controller/pkg/controller/consensus-storage/v1beta1"
+	consensusv1beta1 "github.com/atomix/consensus-storage/controller/pkg/controller/consensus/v1beta1"
 	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/pkg/controller/consensus/v1beta1/cluster.go b/controller/pkg/controller/consensus/v1beta1/cluster.go
@@ -10,7 +10,6 @@ import (
 	"github.com/atomix/consensus-storage/node/pkg/consensus"
 	"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"
 
-	consensusv1beta1 "github.com/atomix/consensus-storage/controller/pkg/apis/consensus-storage/v1beta1"
+	consensusv1beta1 "github.com/atomix/consensus-storage/controller/pkg/apis/consensus/v1beta1"
 	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/consensus/v1beta1/store.go b/controller/pkg/controller/consensus/v1beta1/store.go
@@ -21,7 +21,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/source"
 	"time"
 
-	consensusv1beta1 "github.com/atomix/consensus-storage/controller/pkg/apis/consensus-storage/v1beta1"
+	consensusv1beta1 "github.com/atomix/consensus-storage/controller/pkg/apis/consensus/v1beta1"
 	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/consensus/v1beta1/watcher.go b/controller/pkg/controller/consensus/v1beta1/watcher.go
@@ -27,7 +27,7 @@ import (
 	"sync"
 	"time"
 
-	consensusv1beta1 "github.com/atomix/consensus-storage/controller/pkg/apis/consensus-storage/v1beta1"
+	consensusv1beta1 "github.com/atomix/consensus-storage/controller/pkg/apis/consensus/v1beta1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"