Skip to content

Commit b0a3769

Browse files
howardjohnistio-testing
authored andcommitted
Update Kubernetes dependencies (istio#13324)
* Update kubernetes dependencies * Fix mixer kubernetes logging * Use klog shim * Fix lint and rebase
1 parent 2308a2b commit b0a3769

File tree

652 files changed

+69026
-37853
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

652 files changed

+69026
-37853
lines changed

Gopkg.lock

+70-30
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Gopkg.toml

+12-8
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,22 @@ ignored = [
4343
# https://github.com/kubernetes/client-go#compatibility-matrix
4444
[[override]]
4545
name = "k8s.io/client-go"
46-
branch = "release-8.0" # kubernetes-1.11
46+
branch = "release-10.0" # kubernetes-1.13
4747

48-
# matching client-go kubernetes-1.11.3's
4948
[[override]]
5049
name = "github.com/Azure/go-autorest"
51-
revision = "bca49d5b51a50dc5bb17bbf6204c711c6dbded06"
50+
revision = "ea233b6412b0421a65dc6160e16c893364664a95"
5251

5352
# our mock glog:
5453
[[override]]
5554
name = "github.com/golang/glog"
5655
source = "github.com/istio/glog"
5756

57+
# our mock klog
58+
[[override]]
59+
name = "k8s.io/klog"
60+
source = "github.com/istio/klog"
61+
5862
[[constraint]]
5963
name = "cloud.google.com/go"
6064
version = ">=0.20.0, <1.0.0"
@@ -292,23 +296,23 @@ ignored = [
292296

293297
[[constraint]]
294298
name = "k8s.io/api"
295-
branch = "release-1.11"
299+
branch = "release-1.13"
296300

297301
[[constraint]]
298302
name = "k8s.io/apimachinery"
299-
branch = "release-1.11"
303+
branch = "release-1.13"
300304

301305
[[constraint]]
302306
name = "k8s.io/apiextensions-apiserver"
303-
branch = "release-1.11"
307+
branch = "release-1.13"
304308

305309
[[constraint]]
306310
name = "k8s.io/helm"
307311
version = "2.9.1"
308312

309313
[[constraint]]
310314
name = "k8s.io/kubernetes"
311-
branch = "release-1.11"
315+
branch = "release-1.13"
312316

313317
[prune]
314318
go-tests = true
@@ -352,7 +356,7 @@ ignored = [
352356

353357
[[override]]
354358
name = "github.com/imdario/mergo"
355-
revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc"
359+
revision = "9316a62528ac99aaecb4e47eadd6dc8aa6533d58"
356360

357361
[[constraint]]
358362
name = "github.com/google/go-cmp"

0 commit comments

Comments
 (0)