Skip to content

Commit 7ad9c57

Browse files
committed
bump dependency versions
1 parent 1018749 commit 7ad9c57

File tree

3 files changed

+320
-100
lines changed

3 files changed

+320
-100
lines changed

.travis.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ go:
3636
# so we can use it to create a bunch of common build step
3737
# YAML anchors which we use in our build jobs.
3838
x_base_steps:
39-
# before_install for jobs that require dep
40-
- &dep_before_install
41-
before_install:
42-
- travis_retry make tidy
43-
4439
# before_install for jobs that require go builds and do not run for doc-only changes
4540
- &go_before_install
4641
before_install:
@@ -151,7 +146,6 @@ jobs:
151146
name: Unit, Sanity, and Markdown Tests
152147
# Currently, prow/api-ci tests all PRs that target master; use travis for post merge testing and non-master PRs
153148
if: type != pull_request OR branch != master
154-
<<: *dep_before_install
155149
script: make test/sanity test/unit test/markdown
156150
after_success: echo 'Tests Passed'
157151
after_failure: echo 'Failure in unit, sanity, or markdown test'

go.mod

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ require (
2121
github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c // indirect
2222
github.com/elazarl/goproxy v0.0.0-20190421051319-9d40249d3c2f // indirect
2323
github.com/elazarl/goproxy/ext v0.0.0-20190421051319-9d40249d3c2f // indirect
24-
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
2524
github.com/fatih/camelcase v1.0.0 // indirect
26-
github.com/ghodss/yaml v1.0.0
25+
github.com/ghodss/yaml v1.0.1-0.20180820084758-c7ce16629ff4
2726
github.com/go-logr/logr v0.1.0
2827
github.com/go-logr/zapr v0.1.1
2928
github.com/go-openapi/swag v0.19.0 // indirect
@@ -45,13 +44,11 @@ require (
4544
github.com/mitchellh/go-homedir v1.1.0
4645
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
4746
github.com/mitchellh/mapstructure v1.1.2
48-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
4947
github.com/opencontainers/go-digest v1.0.0-rc1 // indirect
50-
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190128024246-5eb7ae5bdb7a
48+
github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
5149
github.com/operator-framework/operator-registry v1.1.1
5250
github.com/pborman/uuid v1.2.0
5351
github.com/pelletier/go-toml v1.3.0 // indirect
54-
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
5552
github.com/pkg/errors v0.8.1
5653
github.com/prometheus/client_golang v1.0.0
5754
github.com/rogpeppe/go-internal v1.3.0
@@ -67,58 +64,66 @@ require (
6764
github.com/technosophos/moniker v0.0.0-20180509230615-a5dbd03a2245 // indirect
6865
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 // indirect
6966
github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect
70-
github.com/xlab/handysort v0.0.0-20150421192137-fb3537ed64a1 // indirect
7167
github.com/ziutek/mymysql v1.5.4 // indirect
7268
go.etcd.io/bbolt v1.3.3 // indirect
7369
go.uber.org/zap v1.10.0
7470
golang.org/x/tools v0.0.0-20190624180213-70d37148ca0c
7571
google.golang.org/api v0.3.2 // indirect
7672
google.golang.org/genproto v0.0.0-20190404172233-64821d5d2107 // indirect
7773
gopkg.in/gorp.v1 v1.7.2 // indirect
74+
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
7875
gopkg.in/square/go-jose.v2 v2.3.0 // indirect
7976
gopkg.in/yaml.v2 v2.2.2
80-
k8s.io/api v0.0.0-20190918155943-95b840bb6a1f
81-
k8s.io/apiextensions-apiserver v0.0.0-20190918161926-8f644eb6e783
82-
k8s.io/apimachinery v0.0.0-20190913080033-27d36303b655
83-
k8s.io/cli-runtime v0.0.0-20181213153952-835b10687cb6
84-
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
85-
k8s.io/cloud-provider v0.0.0-00010101000000-000000000000 // indirect
86-
k8s.io/code-generator v0.0.0-20190311093542-50b561225d70
87-
k8s.io/gengo v0.0.0-20190327210449-e17681d19d3a
88-
k8s.io/helm v2.14.1+incompatible
77+
k8s.io/api v0.0.0
78+
k8s.io/apiextensions-apiserver v0.0.0
79+
k8s.io/apimachinery v0.0.0
80+
k8s.io/cli-runtime v0.0.0
81+
k8s.io/client-go v11.0.0+incompatible
82+
k8s.io/code-generator v0.0.0
83+
k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f
84+
k8s.io/helm v2.15.0+incompatible
8985
k8s.io/klog v0.3.3
90-
k8s.io/kube-openapi v0.0.0-20190401085232-94e1e7b7574c
86+
k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
9187
k8s.io/kube-state-metrics v1.7.2
92-
k8s.io/kubernetes v1.14.2
93-
sigs.k8s.io/controller-runtime v0.2.0
94-
sigs.k8s.io/controller-tools v0.2.0
95-
sigs.k8s.io/kustomize v2.0.3+incompatible // indirect
88+
k8s.io/kubernetes v1.15.4
89+
sigs.k8s.io/controller-runtime v0.3.0
90+
// Bump to v0.2.2 when controller-tools v0.2.2 is released
91+
// Required for the bugfix https://github.com/kubernetes-sigs/controller-tools/pull/322
92+
sigs.k8s.io/controller-tools v0.2.2-0.20190919011008-6ed4ff330711
9693
vbom.ml/util v0.0.0-20180919145318-efcd4e0f9787 // indirect
9794
)
9895

99-
// Pinned to kubernetes-1.14.1
96+
// Pin to kubernetes-1.15.4
10097
replace (
101-
k8s.io/api => k8s.io/api v0.0.0-20190409021203-6e4e0e4f393b
102-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190409022649-727a075fdec8
103-
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190404173353-6a84e37a896d
104-
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190409021813-1ec86e4da56c
105-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190409023024-d644b00f3b79
106-
k8s.io/client-go => k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
107-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190409023720-1bc0c81fa51d
108-
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190311093542-50b561225d70
109-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190409022021-00b8e31abe9d
110-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190510232812-a01b7d5d6c22
111-
k8s.io/kubernetes => k8s.io/kubernetes v1.14.1
98+
k8s.io/api => k8s.io/api v0.0.0-20190918195907-bd6ac527cfd2
99+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190918201827-3de75813f604
100+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
101+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190918200908-1e17798da8c1
102+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190918202139-0b14c719ca62
103+
k8s.io/client-go => k8s.io/client-go v0.0.0-20190918200256-06eb1244587a
104+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20190918203125-ae665f80358a
105+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.0.0-20190918202959-c340507a5d48
106+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
107+
k8s.io/component-base => k8s.io/component-base v0.0.0-20190918200425-ed2f0867c778
108+
k8s.io/cri-api => k8s.io/cri-api v0.0.0-20190817025403-3ae76f584e79
109+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.0.0-20190918203248-97c07dcbb623
110+
k8s.io/gengo => k8s.io/gengo v0.0.0-20191010091904-7fa3014cb28f
111+
k8s.io/helm => k8s.io/helm v2.15.0+incompatible
112+
k8s.io/klog => k8s.io/klog v0.3.3
113+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190918201136-c3a845f1fbb2
114+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.0.0-20190918202837-c54ce30c680e
115+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20190918143330-0270cf2f1c1d
116+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.0.0-20190918202429-08c8357f8e2d
117+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.0.0-20190918202713-c34a54b3ec8e
118+
k8s.io/kube-state-metrics => k8s.io/kube-state-metrics v1.7.2
119+
k8s.io/kubelet => k8s.io/kubelet v0.0.0-20190918202550-958285cf3eef
120+
k8s.io/kubernetes => k8s.io/kubernetes v1.15.4
121+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.0.0-20190918203421-225f0541b3ea
122+
k8s.io/metrics => k8s.io/metrics v0.0.0-20190918202012-3c1ca76f5bda
123+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.0.0-20190918201353-5cc279503896
112124
)
113125

114-
replace (
115-
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
116-
// down. The github mirror should be used instead.
117-
// Locking to a specific version (from 'go mod graph'):
118-
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
119-
github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
120-
)
121-
122-
// Remove when controller-tools v0.2.2 is released
123-
// Required for the bugfix https://github.com/kubernetes-sigs/controller-tools/pull/322
124-
replace sigs.k8s.io/controller-tools => sigs.k8s.io/controller-tools v0.2.2-0.20190919011008-6ed4ff330711
126+
// Indirect operator-sdk dependencies use git.apache.org, which is frequently
127+
// down. The github mirror should be used instead.
128+
// Locking to a specific version (from 'go mod graph'):
129+
replace git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999

0 commit comments

Comments
 (0)