Skip to content

Commit

Permalink
Switched go-client go module to main stream module
Browse files Browse the repository at this point in the history
  • Loading branch information
abhishekdwivedi3060 committed Sep 19, 2023
1 parent 19ec639 commit 988336c
Show file tree
Hide file tree
Showing 14 changed files with 55 additions and 69 deletions.
2 changes: 1 addition & 1 deletion controllers/access_control.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/client-go/tools/record"

as "github.com/aerospike/aerospike-client-go/v6"
asdbv1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1"
as "github.com/ashishshinde/aerospike-client-go/v6"
)

// logger type alias.
Expand Down
2 changes: 1 addition & 1 deletion controllers/aero_info_calls.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ import (

corev1 "k8s.io/api/core/v1"

as "github.com/aerospike/aerospike-client-go/v6"
asdbv1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1"
"github.com/aerospike/aerospike-kubernetes-operator/pkg/utils"
"github.com/aerospike/aerospike-management-lib/deployment"
as "github.com/ashishshinde/aerospike-client-go/v6"
)

// ------------------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion controllers/client_policy.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import (
"k8s.io/apimachinery/pkg/types"
"sigs.k8s.io/controller-runtime/pkg/client"

as "github.com/aerospike/aerospike-client-go/v6"
asdbv1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1"
as "github.com/ashishshinde/aerospike-client-go/v6"
)

// fromSecretPasswordProvider provides user password from the secret provided in AerospikeUserSpec.
Expand Down
2 changes: 1 addition & 1 deletion controllers/reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,12 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/reconcile"

as "github.com/aerospike/aerospike-client-go/v6"
asdbv1 "github.com/aerospike/aerospike-kubernetes-operator/api/v1"
"github.com/aerospike/aerospike-kubernetes-operator/pkg/jsonpatch"
"github.com/aerospike/aerospike-kubernetes-operator/pkg/utils"
lib "github.com/aerospike/aerospike-management-lib"
"github.com/aerospike/aerospike-management-lib/deployment"
as "github.com/ashishshinde/aerospike-client-go/v6"
)

// SingleClusterReconciler reconciles a single AerospikeCluster
Expand Down
2 changes: 1 addition & 1 deletion controllers/strong_consistency.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package controllers
import (
corev1 "k8s.io/api/core/v1"

as "github.com/aerospike/aerospike-client-go/v6"
"github.com/aerospike/aerospike-management-lib/deployment"
as "github.com/ashishshinde/aerospike-client-go/v6"
)

func (r *SingleClusterReconciler) getAndSetRoster(
Expand Down
26 changes: 14 additions & 12 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ module github.com/aerospike/aerospike-kubernetes-operator
go 1.19

require (
github.com/aerospike/aerospike-management-lib v0.0.0-20230803080950-65d07e4ee37c
github.com/aerospike/aerospike-client-go/v6 v6.14.0
github.com/aerospike/aerospike-management-lib v0.0.0-20230919064932-78dffc17b22f
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d
github.com/ashishshinde/aerospike-client-go/v6 v6.0.1-0.20220606044039-77304169d3a4
github.com/evanphx/json-patch v4.12.0+incompatible
github.com/go-logr/logr v1.2.3
github.com/onsi/ginkgo/v2 v2.9.0
github.com/onsi/gomega v1.27.1
github.com/stretchr/testify v1.8.0
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
github.com/onsi/ginkgo/v2 v2.9.2
github.com/onsi/gomega v1.27.4
github.com/stretchr/testify v1.8.1
golang.org/x/oauth2 v0.4.0 // indirect
golang.org/x/term v0.10.0 // indirect
k8s.io/api v0.26.2
k8s.io/apimachinery v0.26.2
Expand All @@ -31,7 +31,7 @@ replace golang.org/x/net => golang.org/x/net v0.13.0

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
Expand All @@ -40,15 +40,15 @@ require (
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/google/gnostic v0.5.7-v3refs // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38 // indirect
github.com/google/uuid v1.1.2 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand Down Expand Up @@ -78,8 +78,10 @@ require (
golang.org/x/sys v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.6.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20230110181048-76db0878b65f // indirect
google.golang.org/grpc v1.54.0 // indirect
google.golang.org/protobuf v1.29.1 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit 988336c

Please sign in to comment.