Skip to content

Commit 64ce45f

Browse files
Merge pull request #1048 from ecordell/k8s-1.16
chore(deps): bump to kube 1.16
2 parents 5abe75c + 33cb3af commit 64ce45f

File tree

1,043 files changed

+177764
-70240
lines changed

Some content is hidden

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

1,043 files changed

+177764
-70240
lines changed

go.mod

Lines changed: 53 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,81 @@ module github.com/operator-framework/operator-lifecycle-manager
22

33
go 1.12
44

5-
replace (
6-
// Pin openshift version to 4.2 (uses kube 1.14)
7-
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190717200738-0390d1e77d64+incompatible
8-
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190627172412-c44a8b61b9f4
9-
10-
// Pin kube version to 1.14
11-
k8s.io/api => k8s.io/api v0.0.0-20190704095032-f4ca3d3bdf1d
12-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190704104557-6209bbe9f7a9
13-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190704094733-8f6ac2502e51
14-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190704101451-e5f5c6e528cd
15-
k8s.io/client-go => k8s.io/client-go v11.0.1-0.20190521191137-11646d1007e0+incompatible
16-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190704094409-6c2a4329ac29
17-
k8s.io/component-base => k8s.io/component-base v0.0.0-20190704100636-f0322db00a10
18-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190704101955-e796fd6d55e0
19-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30
20-
k8s.io/kubernetes => k8s.io/kubernetes v1.14.5-beta.0.0.20190708100021-7936da50c68f
21-
sigs.k8s.io/structured-merge-diff => sigs.k8s.io/structured-merge-diff v0.0.0-20190302045857-e85c7b244fd2
22-
)
23-
245
require (
6+
github.com/NYTimes/gziphandler v1.0.1 // indirect
257
github.com/blang/semver v3.5.1+incompatible
268
github.com/coreos/go-semver v0.3.0
279
github.com/coreos/go-systemd v0.0.0-20190620071333-e64a0ec8b42a // indirect
28-
github.com/docker/distribution v2.7.1+incompatible // indirect
10+
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
2911
github.com/emicklei/go-restful v2.9.6+incompatible // indirect
3012
github.com/evanphx/json-patch v4.5.0+incompatible // indirect
3113
github.com/ghodss/yaml v1.0.0
3214
github.com/go-openapi/spec v0.19.2
33-
github.com/go-openapi/validate v0.19.2 // indirect
34-
github.com/gogo/protobuf v1.2.0 // indirect
3515
github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
16+
github.com/golang/groupcache v0.0.0-20181024230925-c65c006176ff // indirect
3617
github.com/golang/mock v1.3.1
3718
github.com/google/btree v1.0.0 // indirect
38-
github.com/google/gofuzz v1.0.0 // indirect
3919
github.com/googleapis/gnostic v0.3.0 // indirect
20+
github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 // indirect
4021
github.com/grpc-ecosystem/grpc-gateway v1.9.4 // indirect
41-
github.com/json-iterator/go v1.1.6 // indirect
42-
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
4322
github.com/maxbrunsfeld/counterfeiter/v6 v6.2.1
4423
github.com/mitchellh/hashstructure v1.0.0
4524
github.com/munnerz/goautoneg v0.0.0-20190414153302-2ae31c8b6b30 // indirect
46-
github.com/openshift/api v0.0.0-00010101000000-000000000000
47-
github.com/openshift/client-go v0.0.0-00010101000000-000000000000
48-
github.com/operator-framework/operator-registry v1.1.1
25+
github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
26+
github.com/openshift/client-go v0.0.0-20190923180330-3b6373338c9b
27+
github.com/operator-framework/operator-registry v1.4.0
4928
github.com/pkg/errors v0.8.1
5029
github.com/prometheus/client_golang v0.9.2
30+
github.com/prometheus/common v0.0.0-20190104105734-b1c43a6df3ae // indirect
31+
github.com/prometheus/procfs v0.0.0-20190104112138-b1a0a9a36d74 // indirect
5132
github.com/sirupsen/logrus v1.4.2
33+
github.com/soheilhy/cmux v0.1.4 // indirect
5234
github.com/spf13/cobra v0.0.5
53-
github.com/stretchr/testify v1.3.0
54-
go.uber.org/atomic v1.4.0 // indirect
55-
go.uber.org/zap v1.10.0 // indirect
35+
github.com/stretchr/testify v1.4.0
36+
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
37+
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
5638
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
5739
gonum.org/v1/gonum v0.0.0-20190710053202-4340aa3071a0 // indirect
5840
google.golang.org/grpc v1.23.0
59-
k8s.io/api v0.0.0-20190717022910-653c86b0609b
60-
k8s.io/apiextensions-apiserver v0.0.0-20181204003618-e419c5771cdc
61-
k8s.io/apimachinery v0.0.0-20190717022731-0bb8574e0887
62-
k8s.io/apiserver v0.0.0-20181026151315-13cfe3978170
41+
k8s.io/api v0.0.0
42+
k8s.io/apiextensions-apiserver v0.0.0
43+
k8s.io/apimachinery v0.0.0
44+
k8s.io/apiserver v0.0.0
6345
k8s.io/client-go v8.0.0+incompatible
64-
k8s.io/code-generator v0.0.0-20181203235156-f8cba74510f3
65-
k8s.io/component-base v0.0.0-20190717023551-b4f50308a616
66-
k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a // indirect
67-
k8s.io/kube-aggregator v0.0.0-20181204002017-122bac39d429
68-
k8s.io/kube-openapi v0.0.0-20181031203759-72693cb1fadd
69-
k8s.io/kubernetes v1.11.8-beta.0.0.20190124204751-3a10094374f2
70-
k8s.io/utils v0.0.0-20190712204705-3dccf664f023 // indirect
71-
sigs.k8s.io/structured-merge-diff v0.0.0-00010101000000-000000000000 // indirect
72-
sigs.k8s.io/yaml v1.1.0 // indirect
46+
k8s.io/code-generator v0.0.0
47+
k8s.io/component-base v0.0.0
48+
k8s.io/kube-aggregator v0.0.0
49+
k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf
50+
k8s.io/kubernetes v1.16.0
51+
)
52+
53+
replace (
54+
github.com/openshift/api => github.com/openshift/api v3.9.1-0.20190924102528-32369d4db2ad+incompatible
55+
github.com/openshift/client-go => github.com/openshift/client-go v0.0.0-20190627172412-3b6373338c9b
56+
57+
// Pin to kube 1.16
58+
k8s.io/api => k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
59+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
60+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
61+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918160949-bfa5e2e684ad
62+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918162238-f783a3654da8
63+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918160344-1fbdaa4c8d90
64+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918163234-a9c1f33e9fb9
65+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918163108-da9fdfce26bb
66+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912054826-cd179ad6a269
67+
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918160511-547f6c5d7090
68+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac
69+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918163402-db86a8c7bb21
70+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918161219-8c8f079fddc3
71+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918162944-7a93a0ddadd8
72+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918162534-de037b596c1e
73+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918162820-3b5c1246eb18
74+
k8s.io/kubectl => k8s.io/kubectl v0.0.0-20190918164019-21692a0861df
75+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918162654-250a1838aa2c
76+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918163543-cfa506e53441
77+
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918162108-227c654b2546
78+
k8s.io/node-api => k8s.io/node-api v0.0.0-20190918163711-2299658ad911
79+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918161442-d4c9c65c82af
80+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.0.0-20190918162410-e45c26d066f2
81+
k8s.io/sample-controller => k8s.io/sample-controller v0.0.0-20190918161628-92eb3cb7496c
7382
)

0 commit comments

Comments
 (0)