homelab/traefik
1
0
Fork 0
Code Activity

Migrate from libkv to valkeyrie library

Browse source
This commit is contained in:
NicoMen 2018-01-24 17:52:03 +01:00 • committed by Traefiker
parent a91080b060
commit 563a0bd274
33 changed files with 109 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

6
provider/boltdb/boltdb.go
View file

@ -3,12 +3,12 @@ package boltdb
import (
"fmt"
"github.com/abronan/valkeyrie/store"
"github.com/abronan/valkeyrie/store/boltdb"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/provider/kv"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/boltdb"
)
var _ provider.Provider = (*Provider)(nil)
@ -23,7 +23,7 @@ type Provider struct {
func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool, constraints types.Constraints) error {
store, err := p.CreateStore()
if err != nil {
return fmt.Errorf("Failed to Connect to KV store: %v", err)
return fmt.Errorf("failed to Connect to KV store: %v", err)
}
p.SetKVClient(store)
return p.Provider.Provide(configurationChan, pool, constraints)

6
provider/consul/consul.go
View file

@ -3,12 +3,12 @@ package consul
import (
"fmt"
"github.com/abronan/valkeyrie/store"
"github.com/abronan/valkeyrie/store/consul"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/provider/kv"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/consul"
)
var _ provider.Provider = (*Provider)(nil)
@ -23,7 +23,7 @@ type Provider struct {
func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool, constraints types.Constraints) error {
store, err := p.CreateStore()
if err != nil {
return fmt.Errorf("Failed to Connect to KV store: %v", err)
return fmt.Errorf("failed to Connect to KV store: %v", err)
}
p.SetKVClient(store)
return p.Provider.Provide(configurationChan, pool, constraints)

8
provider/etcd/etcd.go
View file

@ -3,14 +3,14 @@ package etcd
import (
"fmt"
"github.com/abronan/valkeyrie/store"
"github.com/abronan/valkeyrie/store/etcd/v2"
"github.com/abronan/valkeyrie/store/etcd/v3"
"github.com/containous/traefik/log"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/provider/kv"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/etcd/v2"
"github.com/docker/libkv/store/etcd/v3"
)
var _ provider.Provider = (*Provider)(nil)
@ -26,7 +26,7 @@ type Provider struct {
func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool, constraints types.Constraints) error {
store, err := p.CreateStore()
if err != nil {
return fmt.Errorf("Failed to Connect to KV store: %v", err)
return fmt.Errorf("failed to Connect to KV store: %v", err)
}
p.SetKVClient(store)
return p.Provider.Provide(configurationChan, pool, constraints)

2
provider/kv/filler_test.go
View file

@ -5,7 +5,7 @@ import (
"strings"
"testing"
"github.com/docker/libkv/store"
"github.com/abronan/valkeyrie/store"
"github.com/stretchr/testify/assert"
)

6
provider/kv/kv.go
View file

@ -6,14 +6,14 @@ import (
"strings"
"time"
"github.com/abronan/valkeyrie"
"github.com/abronan/valkeyrie/store"
"github.com/cenk/backoff"
"github.com/containous/traefik/job"
"github.com/containous/traefik/log"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/docker/libkv"
"github.com/docker/libkv/store"
)
// Provider holds common configurations of key-value providers.
@ -44,7 +44,7 @@ func (p *Provider) CreateStore() (store.Store, error) {
return nil, err
}
}
return libkv.NewStore(
return valkeyrie.NewStore(
p.storeType,
strings.Split(p.Endpoint, ","),
storeConfig,

2
provider/kv/kv_config.go
View file

@ -10,12 +10,12 @@ import (
"text/template"
"github.com/BurntSushi/ty/fun"
"github.com/abronan/valkeyrie/store"
"github.com/containous/flaeg"
"github.com/containous/traefik/log"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
"github.com/docker/libkv/store"
)
func (p *Provider) buildConfiguration() *types.Configuration {

2
provider/kv/kv_config_test.go
View file

@ -6,11 +6,11 @@ import (
"testing"
"time"
"github.com/abronan/valkeyrie/store"
"github.com/containous/flaeg"
"github.com/containous/traefik/provider/label"
"github.com/containous/traefik/tls"
"github.com/containous/traefik/types"
"github.com/docker/libkv/store"
"github.com/stretchr/testify/assert"
)

2
provider/kv/kv_mock_test.go
View file

@ -4,7 +4,7 @@ import (
"errors"
"strings"
"github.com/docker/libkv/store"
"github.com/abronan/valkeyrie/store"
)
func newProviderMock(kvPairs []*store.KVPair) *Provider {

2
provider/kv/kv_test.go
View file

@ -4,8 +4,8 @@ import (
"testing"
"time"
"github.com/abronan/valkeyrie/store"
"github.com/containous/traefik/types"
"github.com/docker/libkv/store"
)
func TestKvWatchTree(t *testing.T) {

6
provider/zk/zk.go
View file

@ -3,12 +3,12 @@ package zk
import (
"fmt"
"github.com/abronan/valkeyrie/store"
"github.com/abronan/valkeyrie/store/zookeeper"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/provider/kv"
"github.com/containous/traefik/safe"
"github.com/containous/traefik/types"
"github.com/docker/libkv/store"
"github.com/docker/libkv/store/zookeeper"
)
var _ provider.Provider = (*Provider)(nil)
@ -23,7 +23,7 @@ type Provider struct {
func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool, constraints types.Constraints) error {
store, err := p.CreateStore()
if err != nil {
return fmt.Errorf("Failed to Connect to KV store: %v", err)
return fmt.Errorf("failed to Connect to KV store: %v", err)
}
p.SetKVClient(store)
return p.Provider.Provide(configurationChan, pool, constraints)