Skip to content

Commit 2c99cc0

Browse files
committed
Update to release 1.14.1
1 parent 960bc03 commit 2c99cc0

3 files changed

Lines changed: 114 additions & 144 deletions

File tree

brightbox/load_balancer_test.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818
"context"
1919
"fmt"
2020
"strconv"
21+
"strings"
2122
"testing"
2223

2324
"github.com/brightbox/gobrightbox"
@@ -813,14 +814,14 @@ func TestValidateDomains(t *testing.T) {
813814
serviceAnnotationLoadBalancerSslDomains: missingDomain,
814815
},
815816
cloudIp: &resolvCip,
816-
status: "Failed to resolve \"" + missingDomain + "\" to load balancer address (" + resolvCip.PublicIPv4 + "," + resolvCip.PublicIPv6 + "): lookup " + missingDomain + ": no such host",
817+
status: "Failed to resolve \"" + missingDomain + "\" to load balancer address (" + resolvCip.PublicIPv4 + "," + resolvCip.PublicIPv6 + "):",
817818
},
818819
"missing domain in list": {
819820
annotations: map[string]string{
820821
serviceAnnotationLoadBalancerSslDomains: resolvedDomain + "," + missingDomain,
821822
},
822823
cloudIp: &resolvCip,
823-
status: "Failed to resolve \"" + missingDomain + "\" to load balancer address (" + resolvCip.PublicIPv4 + "," + resolvCip.PublicIPv6 + "): lookup " + missingDomain + ": no such host",
824+
status: "Failed to resolve \"" + missingDomain + "\" to load balancer address (" + resolvCip.PublicIPv4 + "," + resolvCip.PublicIPv6 + "):",
824825
},
825826
"other addresses": {
826827
annotations: map[string]string{
@@ -842,7 +843,7 @@ func TestValidateDomains(t *testing.T) {
842843
err := validateContextualAnnotations(tc.annotations, tc.cloudIp)
843844
if err == nil {
844845
t.Errorf("Expected error %q got nil", tc.status)
845-
} else if err.Error() != tc.status {
846+
} else if !strings.HasPrefix(err.Error(), tc.status) {
846847
t.Errorf("Expected %q, got %q", tc.status, err.Error())
847848
}
848849
})

go.mod

Lines changed: 12 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,13 @@
11
module github.com/brightbox/brightbox-cloud-controller-manager
22

33
require (
4-
bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c // indirect
54
cloud.google.com/go v0.35.1 // indirect
65
contrib.go.opencensus.io/exporter/ocagent v0.4.4 // indirect
76
github.com/Azure/azure-sdk-for-go v21.3.0+incompatible // indirect
8-
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
97
github.com/Azure/go-autorest v11.2.8+incompatible // indirect
8+
github.com/GoogleCloudPlatform/k8s-cloud-provider v0.0.0-20190215001258-86da684ff21b // indirect
109
github.com/NYTimes/gziphandler v1.0.1 // indirect
1110
github.com/PuerkitoBio/purell v1.1.1 // indirect
12-
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc // indirect
13-
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf // indirect
1411
github.com/aws/aws-sdk-go v1.16.36 // indirect
1512
github.com/aws/aws-sdk-go-v2 v2.0.0-preview.4+incompatible
1613
github.com/brightbox/gobrightbox v0.2.1
@@ -25,101 +22,67 @@ require (
2522
github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect
2623
github.com/dnaeon/go-vcr v1.0.1 // indirect
2724
github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff // indirect
28-
github.com/docker/docker v0.0.0-20180612054059-a9fbbdc8dd87 // indirect
29-
github.com/elazarl/go-bindata-assetfs v1.0.0 // indirect
3025
github.com/emicklei/go-restful v2.8.1+incompatible // indirect
31-
github.com/emicklei/go-restful-swagger12 v0.0.0-20170926063155-7524189396c6 // indirect
3226
github.com/evanphx/json-patch v4.1.1-0.20190203023257-5858425f7550+incompatible // indirect
3327
github.com/go-ini/ini v1.39.3 // indirect
34-
github.com/go-kit/kit v0.8.0 // indirect
35-
github.com/go-logfmt/logfmt v0.3.0 // indirect
36-
github.com/go-openapi/jsonpointer v0.17.2 // indirect
37-
github.com/go-openapi/jsonreference v0.17.2 // indirect
38-
github.com/go-openapi/spec v0.17.2 // indirect
39-
github.com/go-openapi/strfmt v0.19.0 // indirect
40-
github.com/go-openapi/swag v0.17.2 // indirect
41-
github.com/go-openapi/validate v0.19.0 // indirect
42-
github.com/go-stack/stack v1.8.0 // indirect
4328
github.com/go-test/deep v1.0.1
4429
github.com/gogo/protobuf v1.2.1 // indirect
4530
github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
46-
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf // indirect
31+
github.com/google/uuid v1.1.1 // indirect
4732
github.com/googleapis/gnostic v0.2.0 // indirect
48-
github.com/gophercloud/gophercloud v0.0.0-20180330165814-781450b3c4fc // indirect
33+
github.com/gophercloud/gophercloud v0.0.0-20190408160324-6c7ac67f8855 // indirect
4934
github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e // indirect
5035
github.com/gorilla/websocket v1.4.0 // indirect
51-
github.com/gotestyourself/gotestyourself v2.2.0+incompatible // indirect
52-
github.com/gregjones/httpcache v0.0.0-20190203031600-7a902570cb17 // indirect
5336
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 // indirect
5437
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
5538
github.com/grpc-ecosystem/grpc-gateway v1.7.0 // indirect
56-
github.com/hashicorp/golang-lru v0.5.0 // indirect
5739
github.com/imdario/mergo v0.3.7 // indirect
5840
github.com/inconshreveable/mousetrap v1.0.0 // indirect
5941
github.com/jonboulle/clockwork v0.1.0 // indirect
6042
github.com/json-iterator/go v1.1.5 // indirect
6143
github.com/jtolds/gls v4.2.1+incompatible // indirect
62-
github.com/julienschmidt/httprouter v1.2.0 // indirect
6344
github.com/kardianos/osext v0.0.0-20170510131534-ae77be60afb1 // indirect
64-
github.com/konsorten/go-windows-terminal-sequences v1.0.1 // indirect
65-
github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515 // indirect
6645
github.com/marstr/guid v1.1.0 // indirect
67-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
68-
github.com/modern-go/reflect2 v1.0.1 // indirect
69-
github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d // indirect
70-
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223 // indirect
46+
github.com/mitchellh/mapstructure v1.1.2 // indirect
7147
github.com/onsi/ginkgo v1.7.0 // indirect
7248
github.com/onsi/gomega v1.4.3 // indirect
7349
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
74-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7550
github.com/pkg/errors v0.8.1 // indirect
7651
github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90 // indirect
7752
github.com/prometheus/procfs v0.0.0-20190203183350-488faf799f86 // indirect
7853
github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c // indirect
7954
github.com/satori/go.uuid v1.2.0 // indirect
80-
github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2 // indirect
8155
github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
8256
github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c // indirect
8357
github.com/soheilhy/cmux v0.1.4 // indirect
8458
github.com/spf13/afero v1.1.2 // indirect
8559
github.com/spf13/cobra v0.0.3 // indirect
8660
github.com/spf13/pflag v1.0.3 // indirect
8761
github.com/tmc/grpc-websocket-proxy v0.0.0-20171017195756-830351dc03c6 // indirect
88-
github.com/ugorji/go/codec v0.0.0-20181209151446-772ced7fd4c2 // indirect
89-
github.com/vmware/govmomi v0.19.0 // indirect
62+
github.com/vmware/govmomi v0.20.0 // indirect
9063
github.com/vmware/photon-controller-go-sdk v0.0.0-20170310013346-4a435daef6cc // indirect
9164
github.com/xanzy/go-cloudstack v2.3.4+incompatible // indirect
92-
github.com/xiang90/probing v0.0.0-20160813154853-07dd2e8dfe18 // indirect
9365
go.etcd.io/bbolt v1.3.2 // indirect
9466
go.opencensus.io v0.19.0 // indirect
9567
go.uber.org/atomic v1.3.2 // indirect
9668
go.uber.org/multierr v1.1.0 // indirect
9769
go.uber.org/zap v1.9.1 // indirect
98-
golang.org/x/crypto v0.0.0-20190131182504-b8fe1690c613 // indirect
9970
golang.org/x/oauth2 v0.0.0-20190212230446-3e8b2be13635
100-
golang.org/x/sys v0.0.0-20190204203706-41f3e6584952 // indirect
10171
google.golang.org/genproto v0.0.0-20190201180003-4b09977fb922 // indirect
10272
google.golang.org/grpc v1.18.0 // indirect
103-
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
10473
gopkg.in/gcfg.v1 v1.2.3 // indirect
10574
gopkg.in/ini.v1 v1.39.3 // indirect
10675
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
10776
gopkg.in/square/go-jose.v2 v2.2.2 // indirect
10877
gopkg.in/warnings.v0 v0.1.2 // indirect
109-
gotest.tools v2.2.0+incompatible // indirect
110-
k8s.io/api v0.0.0-20190313235455-40a48860b5ab
78+
k8s.io/api v0.0.0-20190409092523-d687e77c8ae9
11179
k8s.io/apiextensions-apiserver v0.0.0-20190315093550-53c4693659ed // indirect
112-
k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1
113-
k8s.io/apiserver v0.0.0-20190313205120-8b27c41bdbb1
114-
k8s.io/client-go v2.0.0-alpha.0.0.20190313235726-6ee68ca5fd83+incompatible // indirect
115-
k8s.io/cloud-provider v0.0.0-20190314002645-c892ea32361a
116-
k8s.io/component-base v0.0.0-20190313120452-4727f38490bc
117-
k8s.io/csi-api v0.0.0-20190314001839-693d387aa133 // indirect
118-
k8s.io/klog v0.0.0-20181108234604-8139d8cb77af
80+
k8s.io/apimachinery v0.0.0-20190409092423-760d1845f48b
81+
k8s.io/cloud-provider v0.0.0-20190409094043-ab62213bfde9
82+
k8s.io/component-base v0.0.0-20190409093041-e34633071963
83+
k8s.io/csi-translation-lib v0.0.0-20190409094144-966e4462e38a // indirect
84+
k8s.io/klog v0.2.0
11985
k8s.io/kube-controller-manager v0.0.0-20190314002447-97ed623e3835 // indirect
120-
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30 // indirect
121-
k8s.io/kubernetes v1.14.0
86+
k8s.io/kubernetes v1.14.1
12287
k8s.io/utils v0.0.0-20190308190857-21c4ce38f2a7 // indirect
123-
sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2 // indirect
124-
sigs.k8s.io/yaml v1.1.0 // indirect
12588
)

0 commit comments

Comments
 (0)