Skip to content

Commit 3e98d0a

Browse files
committed
update dependancies. Replace upstream NodeInfo. Remove namespace indexers
1 parent 443a25e commit 3e98d0a

File tree

14 files changed

+404
-152
lines changed

14 files changed

+404
-152
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ cache:
1010

1111
go_import_path: github.com/atlassian/escalator
1212
go:
13-
- "1.13.x"
13+
- "1.14.x"
1414

1515
before_install:
1616
# install goreturns for linting

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.13 as builder
1+
FROM golang:1.14 as builder
22
WORKDIR /go/src/github.com/atlassian/escalator/
33
COPY go.mod go.sum ./
44
COPY cmd cmd

cmd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ func startLeaderElection(client kubernetes.Interface, resourceLockID string, con
162162
recorder := eventBroadcaster.NewRecorder(eventsScheme, coreV1.EventSource{Component: "escalator"})
163163

164164
// Create leader elector
165-
leaderElector, ctx, startedLeading, err := k8s.GetLeaderElector(context.Background(), config, client.CoreV1(), recorder, resourceLockID)
165+
leaderElector, ctx, startedLeading, err := k8s.GetLeaderElector(context.Background(), config, client.CoreV1(), client.CoordinationV1(), recorder, resourceLockID)
166166
if err != nil {
167167
return nil, err
168168
}

go.mod

Lines changed: 35 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -3,55 +3,41 @@ module github.com/atlassian/escalator
33
go 1.13
44

55
require (
6-
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc
7-
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf
8-
github.com/aws/aws-sdk-go v1.25.40
9-
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973
10-
github.com/davecgh/go-spew v1.1.1
11-
github.com/evanphx/json-patch v4.1.0+incompatible
12-
github.com/gogo/protobuf v1.2.1
13-
github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef
14-
github.com/golang/protobuf v1.2.0
15-
github.com/google/btree v1.0.0
16-
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf
17-
github.com/google/uuid v0.0.0-20161128191214-064e2069ce9c
18-
github.com/googleapis/gnostic v0.2.0
19-
github.com/gregjones/httpcache v0.0.0-20190212212710-3befbb6ad0cc
20-
github.com/hashicorp/golang-lru v0.5.0
21-
github.com/imdario/mergo v0.3.7
22-
github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af
23-
github.com/json-iterator/go v1.1.5
24-
github.com/konsorten/go-windows-terminal-sequences v1.0.1
25-
github.com/matttproud/golang_protobuf_extensions v1.0.1
26-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
27-
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742
28-
github.com/petar/GoLLRB v0.0.0-20130427215148-53be0d36a84c
29-
github.com/peterbourgon/diskv v2.0.1+incompatible
30-
github.com/pkg/errors v0.8.1
31-
github.com/pmezard/go-difflib v1.0.0
32-
github.com/prometheus/client_golang v0.9.2
33-
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90
34-
github.com/prometheus/common v0.2.0
35-
github.com/prometheus/procfs v0.0.0-20190225181712-6ed1f7e10411
36-
github.com/sirupsen/logrus v1.3.0
37-
github.com/spf13/pflag v1.0.3
6+
cloud.google.com/go v0.38.0 // indirect
7+
github.com/101loops/bdd v0.0.0-20161224202746-3e71f58e2cc3 // indirect
8+
github.com/Azure/go-autorest/autorest v0.9.0 // indirect
9+
github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d // indirect
10+
github.com/aws/aws-sdk-go v1.30.7
11+
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
12+
github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect
13+
github.com/golang/protobuf v1.4.0 // indirect
14+
github.com/google/btree v1.0.0 // indirect
15+
github.com/google/uuid v1.1.1
16+
github.com/googleapis/gnostic v0.4.0 // indirect
17+
github.com/gophercloud/gophercloud v0.1.0 // indirect
18+
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
19+
github.com/hashicorp/golang-lru v0.5.4 // indirect
20+
github.com/imdario/mergo v0.3.9 // indirect
21+
github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
22+
github.com/kr/pretty v0.2.0 // indirect
23+
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
24+
github.com/pkg/errors v0.9.1
25+
github.com/prometheus/client_golang v1.5.1
26+
github.com/prometheus/procfs v0.0.11 // indirect
27+
github.com/sirupsen/logrus v1.5.0
3828
github.com/stephanos/clock v0.0.0-20161224195152-e4ec0ab5053e
39-
github.com/stretchr/testify v1.3.0
40-
golang.org/x/crypto v0.0.0-20190225124518-7f87c0fbb88b
41-
golang.org/x/net v0.0.0-20190225153610-fe579d43d832
42-
golang.org/x/oauth2 v0.0.0-20190220154721-9b3c75971fc9
43-
golang.org/x/sys v0.0.0-20190225065934-cc5685c2db12
44-
golang.org/x/text v0.3.0
45-
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c
46-
google.golang.org/appengine v1.4.0
29+
github.com/stretchr/testify v1.5.1
30+
golang.org/x/crypto v0.0.0-20200414173820-0848c9571904 // indirect
31+
golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e // indirect
32+
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
33+
golang.org/x/sys v0.0.0-20200413165638-669c56c373c4 // indirect
34+
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
35+
google.golang.org/appengine v1.6.5 // indirect
4736
gopkg.in/alecthomas/kingpin.v2 v2.2.6
48-
gopkg.in/inf.v0 v0.9.1
49-
gopkg.in/yaml.v2 v2.2.2
50-
k8s.io/api v0.0.0-20190111032252-67edc246be36
51-
k8s.io/apimachinery v0.0.0-20181127025237-2b1284ed4c93
52-
k8s.io/client-go v10.0.0+incompatible
53-
k8s.io/klog v0.2.0
54-
k8s.io/kube-openapi v0.0.0-20190225204428-d50a959ae76a
55-
k8s.io/kubernetes v1.13.3
56-
sigs.k8s.io/yaml v1.1.0
37+
k8s.io/api v0.18.1
38+
k8s.io/apimachinery v0.18.1
39+
k8s.io/client-go v0.18.1
40+
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac // indirect
41+
k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 // indirect
42+
sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e // indirect
5743
)

0 commit comments

Comments
 (0)