From 0d14c7f1871b166b672650299a03b3e9d8d82958 Mon Sep 17 00:00:00 2001 From: Neil Wilson Date: Fri, 28 Sep 2018 10:10:47 +0100 Subject: [PATCH] Update to k8s 1.12 --- brightbox/load_balancer.go | 3 +-- go.mod | 15 ++++++++++----- go.sum | 20 ++++++++++++++++++++ 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/brightbox/load_balancer.go b/brightbox/load_balancer.go index 79bd875d..b65e32c2 100644 --- a/brightbox/load_balancer.go +++ b/brightbox/load_balancer.go @@ -150,8 +150,7 @@ func (c *cloud) GetLoadBalancerName(ctx context.Context, clusterName string, ser } name := service.Name if name == "" { - //FIXME: Change this to DefaultLoadBalancerName after 1.12 - name = cloudprovider.GetLoadBalancerName(service) + name = cloudprovider.DefaultLoadBalancerName(service) } var buffer bytes.Buffer buffer.WriteString(name) diff --git a/go.mod b/go.mod index 6126163b..8f7981e3 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,7 @@ require ( github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 github.com/davecgh/go-spew v1.1.1 github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff + github.com/docker/docker v1.13.1 // indirect github.com/elazarl/go-bindata-assetfs v1.0.0 github.com/emicklei/go-restful v2.8.0+incompatible github.com/emicklei/go-restful-swagger12 v0.0.0-20170208215640-dcef7f557305 @@ -32,6 +33,7 @@ require ( github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf github.com/googleapis/gnostic v0.2.0 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 github.com/imdario/mergo v0.3.6 github.com/inconshreveable/mousetrap v1.0.0 @@ -66,11 +68,14 @@ require ( gopkg.in/natefinch/lumberjack.v2 v2.0.0-20170531160350-a96e63847dc3 gopkg.in/square/go-jose.v2 v2.1.8 gopkg.in/yaml.v2 v2.2.1 - k8s.io/api v0.0.0-20180712090710-2d6f90ab1293 + k8s.io/api v0.0.0-20180925152912-a191abe0b71e k8s.io/apiextensions-apiserver v0.0.0-20180808065829-408db4a50408 - k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d - k8s.io/apiserver v0.0.0-20180808060109-1844acd6a035 - k8s.io/client-go v0.0.0-20180806134042-1f13a808da65 + k8s.io/apimachinery v0.0.0-20180927151612-c6dd271be006 + k8s.io/apiserver v0.0.0-20180928074203-ec2b99f30258 + k8s.io/client-go v9.0.0+incompatible + k8s.io/csi-api v0.0.0-20180925155520-31ae05d8096d // indirect + k8s.io/kube-controller-manager v0.0.0-20180909204853-481b4013cbb6 // indirect k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c - k8s.io/kubernetes v1.11.2 + k8s.io/kubernetes v1.12.0 + k8s.io/utils v0.0.0-20180918230422-cd34563cd63c // indirect ) diff --git a/go.sum b/go.sum index 99e727f9..3439673c 100644 --- a/go.sum +++ b/go.sum @@ -24,6 +24,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff h1:FKH02LHYqSmeWd3GBh0KIkM8JBpw3RrShgtcWShdWJg= github.com/docker/distribution v0.0.0-20170726174610-edc3ab29cdff/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= +github.com/docker/docker v1.13.1 h1:5VBhsO6ckUxB0A8CE5LlUJdXzik9cbEbBTQ/ggeml7M= +github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk= github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4= github.com/emicklei/go-restful v2.8.0+incompatible h1:wN8GCRDPGHguIynsnBartv5GUgGUg1LAU7+xnSn1j7Q= @@ -62,6 +64,8 @@ github.com/googleapis/gnostic v0.2.0 h1:l6N3VoaVzTncYYW+9yOz2LJJammFZGBO13sqgEhp github.com/googleapis/gnostic v0.2.0/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 h1:pdN6V1QBWetyv/0+wjACpqVH+eVULgEjkurDLq3goeM= github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47 h1:UnszMmmmm5vLwWzDjTFVIkfhvWF1NdrmChl8L2NUDCw= github.com/hashicorp/golang-lru v0.0.0-20180201235237-0fb14efe8c47/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28= @@ -130,15 +134,31 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= k8s.io/api v0.0.0-20180712090710-2d6f90ab1293 h1:hROmpFC7JMobXFXMmD7ZKZLhDKvr1IKfFJoYS/45G/8= k8s.io/api v0.0.0-20180712090710-2d6f90ab1293/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= +k8s.io/api v0.0.0-20180925152912-a191abe0b71e h1:Mx42+OpPb8/BDCRrGGmrnv77tCgzyE2PeaBX1RP19M0= +k8s.io/api v0.0.0-20180925152912-a191abe0b71e/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA= k8s.io/apiextensions-apiserver v0.0.0-20180808065829-408db4a50408 h1:GcrrWo5PlDjJ6cSFoxKlIy3xH+IvXa/uYs90NxdbEV4= k8s.io/apiextensions-apiserver v0.0.0-20180808065829-408db4a50408/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d h1:MZjlsu9igBoVPZkXpIGoxI6EonqNsXXZU7hhvfQLkd4= k8s.io/apimachinery v0.0.0-20180621070125-103fd098999d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= +k8s.io/apimachinery v0.0.0-20180927151612-c6dd271be006 h1:JXoPWp33Ak0s8bDD8KBKVHlOSXEjW7FZ4fOry7wBS2A= +k8s.io/apimachinery v0.0.0-20180927151612-c6dd271be006/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0= k8s.io/apiserver v0.0.0-20180808060109-1844acd6a035 h1:vM1U45Dwa81D9aIUG1PpuoUrPPqSdEndRu9DZ3/QPMc= k8s.io/apiserver v0.0.0-20180808060109-1844acd6a035/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w= +k8s.io/apiserver v0.0.0-20180928074203-ec2b99f30258 h1:5u+fSmapiuLI0UmkSqXKoh73pUfDQx168VUl26PrSCs= +k8s.io/apiserver v0.0.0-20180928074203-ec2b99f30258/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w= k8s.io/client-go v0.0.0-20180806134042-1f13a808da65 h1:wQUEIVcXYxsDE8RXfUufo1nfnkeH/BEPhT175YIzea4= k8s.io/client-go v0.0.0-20180806134042-1f13a808da65/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= +k8s.io/client-go v9.0.0+incompatible h1:fytkSPvGpDBjLebua3wa5CiDSamq9ysKjLS8GCVUS3s= +k8s.io/client-go v9.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s= +k8s.io/csi-api v0.0.0-20180925155520-31ae05d8096d h1:LszCiq+lSUOXwqC7JMB78CT667ZtbNuzWBatP5Guq48= +k8s.io/csi-api v0.0.0-20180925155520-31ae05d8096d/go.mod h1:GH854hXKH+vaEO06X/DMiE/o3rVO1aw8dXJJpP7awjA= +k8s.io/kube-controller-manager v0.0.0-20180909204853-481b4013cbb6 h1:PbJ6nazy+Xn2C2cBKKmgCbmgQ5etdxiwfrld5c2S1bk= +k8s.io/kube-controller-manager v0.0.0-20180909204853-481b4013cbb6/go.mod h1:PSEJjfqWdqGiNnCXBYIVNE0PBUAug48nS+Sev3ToqLA= k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c h1:3KSCztE7gPitlZmWbNwue/2U0YruD65DqX3INopDAQM= k8s.io/kube-openapi v0.0.0-20180731170545-e3762e86a74c/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc= k8s.io/kubernetes v1.11.2 h1:2/lmzYbN17Mr23mX/p4ODMm/MBWTeu2Q1Bvsw82YC40= k8s.io/kubernetes v1.11.2/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/kubernetes v1.12.0 h1:jPDApxpqyQ/THiLnquNHidiHC1F8jvDi7BUGfNtue30= +k8s.io/kubernetes v1.12.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= +k8s.io/utils v0.0.0-20180918230422-cd34563cd63c h1:1fJozimgUsIqPVvgjlpeh53pMbPFXXFiCoe4CErMFJ0= +k8s.io/utils v0.0.0-20180918230422-cd34563cd63c/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=