Skip to content

Commit

Permalink
Merge pull request #250 from arangodb/bugfix/use-correct-retry
Browse files Browse the repository at this point in the history
Avoid use of arangosync packages
  • Loading branch information
ewoutp authored Sep 7, 2018
2 parents e2818d8 + 7159561 commit f0a0029
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion pkg/operator/operator_leader.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ import (
"k8s.io/client-go/tools/leaderelection"
"k8s.io/client-go/tools/leaderelection/resourcelock"

"github.com/arangodb/arangosync/pkg/retry"
"github.com/arangodb/kube-arangodb/pkg/util/constants"
"github.com/arangodb/kube-arangodb/pkg/util/k8sutil"
"github.com/arangodb/kube-arangodb/pkg/util/probe"
"github.com/arangodb/kube-arangodb/pkg/util/retry"
)

// runLeaderElection performs a leader election on a lock with given name in
Expand Down
3 changes: 2 additions & 1 deletion pkg/util/k8sutil/storageclass.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,11 @@ import (
"strconv"
"time"

"github.com/arangodb/arangosync/pkg/retry"
"k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
storagev1 "k8s.io/client-go/kubernetes/typed/storage/v1"

"github.com/arangodb/kube-arangodb/pkg/util/retry"
)

var (
Expand Down

0 comments on commit f0a0029

Please sign in to comment.