Skip to content

Commit a88f534

Browse files
Merge pull request #793 from jpeeler/rebase-1.12
Update Kubernetes dependencies to 1.12.7
2 parents 836d963 + 4e6c7e4 commit a88f534

File tree

560 files changed

+34676
-8828
lines changed

Some content is hidden

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

560 files changed

+34676
-8828
lines changed

go.mod

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
module github.com/operator-framework/operator-lifecycle-manager
22

33
require (
4+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
5+
github.com/Sirupsen/logrus v0.0.0-00010101000000-000000000000 // indirect
46
github.com/coreos/bbolt v1.3.2 // indirect
57
github.com/coreos/etcd v3.3.12+incompatible // indirect
68
github.com/coreos/go-semver v0.2.0
79
github.com/coreos/go-systemd v0.0.0-20190204112023-081494f7ee4f // indirect
810
github.com/docker/distribution v2.7.1+incompatible // indirect
11+
github.com/docker/docker v1.13.1 // indirect
912
github.com/emicklei/go-restful v2.9.0+incompatible // indirect
13+
github.com/evanphx/json-patch v4.1.1-0.20190203023257-5858425f7550+incompatible // indirect
1014
github.com/ghodss/yaml v1.0.0
1115
github.com/go-openapi/spec v0.17.2
1216
github.com/go-openapi/strfmt v0.19.0 // indirect
@@ -44,5 +48,23 @@ require (
4448
k8s.io/klog v0.2.0 // indirect
4549
k8s.io/kube-aggregator v0.0.0-20190223015803-f706565beac0
4650
k8s.io/kube-openapi v0.0.0-20181031203759-72693cb1fadd
47-
k8s.io/kubernetes v1.11.10-beta.0.0.20190325075447-8253d66ee09e
51+
k8s.io/kubernetes v1.12.7
52+
)
53+
54+
replace (
55+
// This is necessary due to the combination of logrus casing changing
56+
// without bumping the major version and the extremely old version of
57+
// docker that's being pulled in.
58+
// original breakage - https://github.com/sirupsen/logrus/issues/451
59+
// breakage explanation - https://github.com/golang/go/issues/26208#issuecomment-411955266
60+
github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.1.0
61+
// all of the below are using the kubernetes-1.12.7 tag
62+
// remember to bump kubernetes above also when upgrading
63+
k8s.io/api => k8s.io/api v0.0.0-20190325144926-266ff08fa05d
64+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.0.0-20190325151511-42d4d5ce2c84
65+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc
66+
k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190325150012-164c02b49fbe
67+
k8s.io/client-go => k8s.io/client-go v2.0.0-alpha.0.0.20190325145348-5392b64e5c0b+incompatible
68+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20181128191024-b1289fc74931
69+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.0.0-20190325150400-0a029fc09217
4870
)

go.sum

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c h1:t+Ra932MCC0eeyD/vigXqMbZTzgZjd4JOfBJWC6VSMI=
22
bitbucket.org/ww/goautoneg v0.0.0-20120707110453-75cd24fc2f2c/go.mod h1:1vhO7Mn/FZMgOgDVGLy5X1mE6rq1HbkBdkF/yj8zkcg=
33
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
4+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
5+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
46
github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
57
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
68
github.com/NYTimes/gziphandler v1.0.1 h1:iLrQrdwjDd52kHDA5op2UBJFjmOb9g+7scBan4RN8F0=
@@ -40,6 +42,8 @@ github.com/docker/distribution v2.6.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4Kfc
4042
github.com/docker/distribution v2.7.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
4143
github.com/docker/distribution v2.7.1+incompatible h1:a5mlkVzth6W5A4fOsS3D2EO5BUmsJpcB+cRlLU7cSug=
4244
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
45+
github.com/docker/docker v1.13.1 h1:IkZjBSIc8hBjLpqeAbeE5mca5mNgeatLHBy3GO78BWo=
46+
github.com/docker/docker v1.13.1/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
4347
github.com/elazarl/go-bindata-assetfs v1.0.0 h1:G/bYguwHIzWq9ZoyUQqrjTmJbbYn3j3CKKpKinvZLFk=
4448
github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
4549
github.com/emicklei/go-restful v2.8.0+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
@@ -51,6 +55,8 @@ github.com/emicklei/go-restful-swagger12 v0.0.0-20170926063155-7524189396c6/go.m
5155
github.com/evanphx/json-patch v3.0.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
5256
github.com/evanphx/json-patch v4.1.0+incompatible h1:K1MDoo4AZ4wU0GIU/fPmtZg7VpzLjCxu+UwBD1FvwOc=
5357
github.com/evanphx/json-patch v4.1.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
58+
github.com/evanphx/json-patch v4.1.1-0.20190203023257-5858425f7550+incompatible h1:awQvTc1NrN0coUC8jz9Z1TxELzlcIMn5NqFtRgIXUKk=
59+
github.com/evanphx/json-patch v4.1.1-0.20190203023257-5858425f7550+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
5460
github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
5561
github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
5662
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
@@ -214,6 +220,8 @@ github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1 h1:/K3IL0Z1quvmJ
214220
github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
215221
github.com/sclevine/spec v1.0.0 h1:ILQ08A/CHCz8GGqivOvI54Hy1U40wwcpkf7WtB1MQfY=
216222
github.com/sclevine/spec v1.0.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24q7p+U=
223+
github.com/sirupsen/logrus v1.1.0 h1:65VZabgUiV9ktjGM5nTq0+YurgTyX+YI2lSSfDjI+qU=
224+
github.com/sirupsen/logrus v1.1.0/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A=
217225
github.com/sirupsen/logrus v1.1.1/go.mod h1:zrgwTnHtNr00buQ1vSptGe8m1f/BbgsPukg8qsT7A+A=
218226
github.com/sirupsen/logrus v1.2.0 h1:juTguoYk5qI21pwyTXY3B3Y5cOTH3ZUyZCg1v/mihuo=
219227
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
@@ -303,20 +311,32 @@ k8s.io/api v0.0.0-20180904230853-4e7be11eab3f/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j
303311
k8s.io/api v0.0.0-20181203235848-2dd39edadc55/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
304312
k8s.io/api v0.0.0-20190118113203-912cbe2bfef3 h1:lV0+KGoNkvZOt4zGT4H83hQrzWMt/US/LSz4z4+BQS4=
305313
k8s.io/api v0.0.0-20190118113203-912cbe2bfef3/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
314+
k8s.io/api v0.0.0-20190325144926-266ff08fa05d h1:s26D0gEck3qSZopZRiaVtlwKErnRfo3bEfB/a3mBWYg=
315+
k8s.io/api v0.0.0-20190325144926-266ff08fa05d/go.mod h1:iuAfoD4hCxJ8Onx9kaTIt30j7jUFS00AXQi6QMi99vA=
306316
k8s.io/apiextensions-apiserver v0.0.0-20180905004947-16750353bf97/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
307317
k8s.io/apiextensions-apiserver v0.0.0-20181204003618-e419c5771cdc/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
308318
k8s.io/apiextensions-apiserver v0.0.0-20190223021643-57c81b676ab1 h1:G1EvkV2I9OP/boVVnUYNgx7i9Tx22KrZ20l4utk+pPg=
309319
k8s.io/apiextensions-apiserver v0.0.0-20190223021643-57c81b676ab1/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
320+
k8s.io/apiextensions-apiserver v0.0.0-20190325151511-42d4d5ce2c84 h1:fCGNk3mfqCd8K2qab/Co7r+476EXFkHkYFrvZ5ABVOI=
321+
k8s.io/apiextensions-apiserver v0.0.0-20190325151511-42d4d5ce2c84/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE=
310322
k8s.io/apimachinery v0.0.0-20180904193909-def12e63c512/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
311323
k8s.io/apimachinery v0.0.0-20181203235515-3d8ee2261517/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
312324
k8s.io/apimachinery v0.0.0-20190118094746-1525e4dadd2d/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
325+
k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc h1:7z9/6jKWBqkK9GI1RRB0B5fZcmkatLQ/nv8kysch24o=
326+
k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
313327
k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841 h1:Q4RZrHNtlC/mSdC1sTrcZ5RchC/9vxLVj57pWiCBKv4=
314328
k8s.io/apimachinery v0.0.0-20190223001710-c182ff3b9841/go.mod h1:ccL7Eh7zubPUSh9A3USN90/OzHNSVN6zxzde07TDCL0=
315329
k8s.io/apiserver v0.0.0-20181026151315-13cfe3978170 h1:CqI85nZvPaV+7JFono0nAOGOx2brocqefcOhDPVhHKI=
316330
k8s.io/apiserver v0.0.0-20181026151315-13cfe3978170/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
331+
k8s.io/apiserver v0.0.0-20190325150012-164c02b49fbe h1:wtlVS7dDQyc7Ve0kHxO7hH0qwF7dd7pEjwjZDf40lV4=
332+
k8s.io/apiserver v0.0.0-20190325150012-164c02b49fbe/go.mod h1:6bqaTSOSJavUIXUtfaR9Os9JtTCm8ZqH2SUl2S60C4w=
317333
k8s.io/client-go v0.0.0-20180718001006-59698c7d9724/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
334+
k8s.io/client-go v2.0.0-alpha.0.0.20190325145348-5392b64e5c0b+incompatible h1:1SUAp14ux5XzsuDzLi1l6LYI5ZaTb/QfUGOffV+oK1w=
335+
k8s.io/client-go v2.0.0-alpha.0.0.20190325145348-5392b64e5c0b+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
318336
k8s.io/client-go v8.0.0+incompatible h1:2pUaSg2x6iEHr8cia6zmWhoCXG1EDG9TCx9s//Aq7HY=
319337
k8s.io/client-go v8.0.0+incompatible/go.mod h1:7vJpHMYJwNQCWgzmNV+VYUl1zCObLyodBc8nIyt8L5s=
338+
k8s.io/code-generator v0.0.0-20181128191024-b1289fc74931 h1:5nlNOG+ShM9gcSivU8/IEhrANa/ljMMEJ1sw86/eFzQ=
339+
k8s.io/code-generator v0.0.0-20181128191024-b1289fc74931/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8=
320340
k8s.io/code-generator v0.0.0-20181203235156-f8cba74510f3 h1:f/Aa24HPnPEDWia884BCF94E1b29KYjOTVTHcBzvT2Q=
321341
k8s.io/code-generator v0.0.0-20181203235156-f8cba74510f3/go.mod h1:MYiN+ZJZ9HkETbgVZdWw2AsuAi9PZ4V80cwfuf2axe8=
322342
k8s.io/gengo v0.0.0-20181106084056-51747d6e00da/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
@@ -330,9 +350,13 @@ k8s.io/klog v0.2.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
330350
k8s.io/kube-aggregator v0.0.0-20181204002017-122bac39d429/go.mod h1:8sbzT4QQKDEmSCIbfqjV0sd97GpUT7A4W626sBiYJmU=
331351
k8s.io/kube-aggregator v0.0.0-20190223015803-f706565beac0 h1:WmKaovTZLNG5tUqOJmMYvVn+0raGhizjJ69J3isljro=
332352
k8s.io/kube-aggregator v0.0.0-20190223015803-f706565beac0/go.mod h1:8sbzT4QQKDEmSCIbfqjV0sd97GpUT7A4W626sBiYJmU=
353+
k8s.io/kube-aggregator v0.0.0-20190325150400-0a029fc09217 h1:GhxG5D7y9wGSkIUnWsKIOjI3VTeXkVC9Pac0nQf90ms=
354+
k8s.io/kube-aggregator v0.0.0-20190325150400-0a029fc09217/go.mod h1:8sbzT4QQKDEmSCIbfqjV0sd97GpUT7A4W626sBiYJmU=
333355
k8s.io/kube-openapi v0.0.0-20181031203759-72693cb1fadd h1:ggv/Vfza0i5xuhUZyYyxcc25AmQvHY8Zi1C2m8WgBvA=
334356
k8s.io/kube-openapi v0.0.0-20181031203759-72693cb1fadd/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
335357
k8s.io/kubernetes v1.11.7-beta.0.0.20181219023948-b875d52ea96d/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
336358
k8s.io/kubernetes v1.11.8-beta.0.0.20190124204751-3a10094374f2/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
337359
k8s.io/kubernetes v1.11.10-beta.0.0.20190325075447-8253d66ee09e h1:kwCz0ml7Z+DrkJUqTLc9KyFCQOlXaFzqp09/2dndnTg=
338360
k8s.io/kubernetes v1.11.10-beta.0.0.20190325075447-8253d66ee09e/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
361+
k8s.io/kubernetes v1.12.7 h1:gm45V16s8YbTBg7NApIdYMtFjY7Bib3eDUyoBtW/AqQ=
362+
k8s.io/kubernetes v1.12.7/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=

pkg/api/client/clientset/versioned/fake/register.go

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/api/client/clientset/versioned/scheme/register.go

Lines changed: 10 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/package-server/apis/apps/v1alpha1/zz_generated.conversion.go

Lines changed: 82 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)