Skip to content
This repository has been archived by the owner on Sep 19, 2018. It is now read-only.

update dependencies and remove vendored #13

Merged
merged 2 commits into from
Nov 9, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
443 changes: 216 additions & 227 deletions glide.lock

Large diffs are not rendered by default.

32 changes: 16 additions & 16 deletions glide.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package: github.com/utilitywarehouse/ingress53
import:
- package: github.com/aws/aws-sdk-go
version: v1.6.18
version: ~1.12.24
subpackages:
- aws
- aws/session
Expand All @@ -10,26 +10,26 @@ import:
- package: github.com/hashicorp/logutils
- package: github.com/miekg/dns
- package: github.com/prometheus/client_golang
version: v0.8.0
version: ~0.9.0-pre1
subpackages:
- prometheus
- prometheus/promhttp
- package: github.com/utilitywarehouse/go-operational
subpackages:
- op
- package: k8s.io/client-go
version: v1.5.0
- package: k8s.io/api
subpackages:
- extensions/v1beta1
- package: k8s.io/apimachinery
subpackages:
- 1.5/kubernetes
- 1.5/pkg/api
- 1.5/pkg/apis/extensions/v1beta1
- 1.5/pkg/labels
- 1.5/pkg/runtime
- 1.5/pkg/watch
- 1.5/rest
- 1.5/tools/cache
- 1.5/tools/clientcmd
- package: github.com/emicklei/go-restful
version: 1.0.0
- pkg/apis/meta/v1
- pkg/labels
- pkg/runtime
- pkg/watch
- package: k8s.io/client-go
version: ~5.0.1
subpackages:
- swagger
- kubernetes
- rest
- tools/cache
- tools/clientcmd
20 changes: 10 additions & 10 deletions ingress.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"log"
"time"

"k8s.io/client-go/1.5/kubernetes"
"k8s.io/client-go/1.5/pkg/api"
"k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/1.5/pkg/runtime"
"k8s.io/client-go/1.5/pkg/watch"
"k8s.io/client-go/1.5/tools/cache"
"k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/cache"
)

type eventHandlerFunc func(eventType watch.EventType, oldIngress *v1beta1.Ingress, newIngress *v1beta1.Ingress)
Expand All @@ -32,11 +32,11 @@ func newIngressWatcher(client kubernetes.Interface, eventHandler eventHandlerFun

func (iw *ingressWatcher) Start() {
lw := &cache.ListWatch{
ListFunc: func(options api.ListOptions) (runtime.Object, error) {
return iw.client.Extensions().Ingresses(api.NamespaceAll).List(options)
ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
return iw.client.Extensions().Ingresses(v1.NamespaceAll).List(options)
},
WatchFunc: func(options api.ListOptions) (watch.Interface, error) {
return iw.client.Extensions().Ingresses(api.NamespaceAll).Watch(options)
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
return iw.client.Extensions().Ingresses(v1.NamespaceAll).Watch(options)
},
}

Expand Down
10 changes: 5 additions & 5 deletions ingress_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import (
"testing"
"time"

"k8s.io/client-go/1.5/kubernetes/fake"
"k8s.io/client-go/1.5/pkg/api"
"k8s.io/client-go/1.5/pkg/api/v1"
"k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/1.5/pkg/watch"
"k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/api"
"k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes/fake"
)

var (
Expand Down
3 changes: 1 addition & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ import (
"os/signal"
"strings"

"k8s.io/client-go/1.5/tools/clientcmd"

"github.com/hashicorp/logutils"
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"
"github.com/utilitywarehouse/go-operational/op"
"k8s.io/client-go/tools/clientcmd"
)

// Define a type named "strslice" as a slice of strings
Expand Down
10 changes: 5 additions & 5 deletions registrator.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/route53"
"github.com/miekg/dns"
"k8s.io/client-go/1.5/kubernetes"
"k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/1.5/pkg/labels"
"k8s.io/client-go/1.5/pkg/watch"
"k8s.io/client-go/1.5/rest"
"k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/rest"
)

var (
Expand Down
8 changes: 4 additions & 4 deletions registrator_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ import (

"github.com/miekg/dns"

"k8s.io/client-go/1.5/pkg/apis/extensions/v1beta1"
"k8s.io/client-go/1.5/pkg/labels"
"k8s.io/client-go/1.5/pkg/watch"
"k8s.io/client-go/1.5/rest"
"k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/rest"
)

const (
Expand Down
15 changes: 0 additions & 15 deletions vendor/cloud.google.com/go/.travis.yml

This file was deleted.

15 changes: 0 additions & 15 deletions vendor/cloud.google.com/go/AUTHORS

This file was deleted.

130 changes: 0 additions & 130 deletions vendor/cloud.google.com/go/CONTRIBUTING.md

This file was deleted.

37 changes: 0 additions & 37 deletions vendor/cloud.google.com/go/CONTRIBUTORS

This file was deleted.

Loading