Skip to content

Commit 0750948

Browse files
Merge pull request #134 from p0lyn0mial/bump-openshift-apiserver-to-1-19
Bug 1844471: Bump openshift apiserver to 1 19
2 parents 5eedc52 + f438f5f commit 0750948

File tree

251 files changed

+9309
-6603
lines changed

Some content is hidden

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

251 files changed

+9309
-6603
lines changed

go.mod

Lines changed: 40 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ go 1.13
55
require (
66
github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd
77
github.com/containers/image v3.0.2+incompatible
8-
github.com/coreos/go-etcd v2.0.0+incompatible // indirect
9-
github.com/cpuguy83/go-md2man v1.0.10 // indirect
108
github.com/davecgh/go-spew v1.1.1
119
github.com/docker/distribution v2.7.1+incompatible
1210
github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c
@@ -20,56 +18,54 @@ require (
2018
github.com/hashicorp/golang-lru v0.5.1
2119
github.com/jteeuwen/go-bindata v3.0.8-0.20151023091102-a0ff2567cfb7+incompatible
2220
github.com/opencontainers/go-digest v1.0.0-rc1
23-
github.com/openshift/api v0.0.0-20200724204552-3ae6754513d4
24-
github.com/openshift/apiserver-library-go v0.0.0-20200723181026-dd21ec96ba0a
25-
github.com/openshift/build-machinery-go v0.0.0-20200713135615-1f43d26dccc7
26-
github.com/openshift/client-go v0.0.0-20200722173614-5a1b0aaeff15
27-
github.com/openshift/library-go v0.0.0-20200724235449-b4f9ae5f0c51
21+
github.com/openshift/api v0.0.0-20200901182017-7ac89ba6b971
22+
github.com/openshift/apiserver-library-go v0.0.0-20200901140731-1236dc23c728
23+
github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
24+
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
25+
github.com/openshift/library-go v0.0.0-20200907120738-ea57b121ba1a
2826
github.com/openshift/source-to-image v0.0.0-20200213141744-eed2850f2187
2927
github.com/spf13/cobra v1.0.0
3028
github.com/spf13/pflag v1.0.5
31-
github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8 // indirect
32-
go.etcd.io/etcd v0.5.0-alpha.5.0.20200716221620-18dfb9cca345
33-
golang.org/x/text v0.3.3 // indirect
34-
k8s.io/api v0.19.0-rc.2
35-
k8s.io/apiextensions-apiserver v0.19.0-rc.2
36-
k8s.io/apimachinery v0.19.0-rc.2
37-
k8s.io/apiserver v0.19.0-rc.2
38-
k8s.io/client-go v0.19.0-rc.2
39-
k8s.io/code-generator v0.19.0-rc.2
40-
k8s.io/component-base v0.19.0-rc.2
29+
go.etcd.io/etcd v0.5.0-alpha.5.0.20200819165624-17cef6e3e9d5
30+
k8s.io/api v0.19.0
31+
k8s.io/apiextensions-apiserver v0.19.0
32+
k8s.io/apimachinery v0.19.0
33+
k8s.io/apiserver v0.19.0
34+
k8s.io/client-go v0.19.0
35+
k8s.io/code-generator v0.19.0
36+
k8s.io/component-base v0.19.0
4137
k8s.io/klog v1.0.0
42-
k8s.io/kube-aggregator v0.19.0-rc.2
43-
k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
44-
k8s.io/kubectl v0.19.0-rc.2
45-
k8s.io/kubernetes v1.19.0-rc.2
38+
k8s.io/kube-aggregator v0.19.0
39+
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
40+
k8s.io/kubectl v0.19.0
41+
k8s.io/kubernetes v1.19.0
4642
)
4743

4844
replace (
4945
github.com/docker/distribution => github.com/openshift/docker-distribution v0.0.0-20180925154709-d4c35485a70d
5046
github.com/docker/docker => github.com/openshift/moby-moby v0.0.0-20190308215630-da810a85109d
5147
github.com/moby/buildkit => github.com/dmcgowan/buildkit v0.0.0-20170731200553-da2b9dc7dab9
52-
k8s.io/api => k8s.io/api v0.19.0-rc.2
53-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0-rc.2
54-
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0-rc.2
55-
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20200901074819-8028178308f0
56-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0-rc.2
57-
k8s.io/client-go => k8s.io/client-go v0.19.0-rc.2
58-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0-rc.2
59-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0-rc.2
60-
k8s.io/code-generator => k8s.io/code-generator v0.19.0-rc.2
61-
k8s.io/component-base => k8s.io/component-base v0.19.0-rc.2
62-
k8s.io/cri-api => k8s.io/cri-api v0.19.0-rc.2
63-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0-rc.2
64-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0-rc.2
65-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0-rc.2
66-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200427153329-656914f816f9
67-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0-rc.2
68-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-rc.2
69-
k8s.io/kubectl => k8s.io/kubectl v0.19.0-rc.2
70-
k8s.io/kubelet => k8s.io/kubelet v0.19.0-rc.2
71-
k8s.io/kubernetes => k8s.io/kubernetes v1.19.0-rc.4
72-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0-rc.2
73-
k8s.io/metrics => k8s.io/metrics v0.19.0-rc.2
74-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0-rc.2
48+
k8s.io/api => k8s.io/api v0.19.0
49+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0
50+
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0
51+
k8s.io/apiserver => github.com/openshift/kubernetes-apiserver v0.0.0-20200907145057-b96d25345a7b
52+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0
53+
k8s.io/client-go => k8s.io/client-go v0.19.0
54+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.19.0
55+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0
56+
k8s.io/code-generator => k8s.io/code-generator v0.19.0
57+
k8s.io/component-base => k8s.io/component-base v0.19.0
58+
k8s.io/cri-api => k8s.io/cri-api v0.19.0
59+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0
60+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.19.0
61+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0
62+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
63+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0
64+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0
65+
k8s.io/kubectl => k8s.io/kubectl v0.19.0
66+
k8s.io/kubelet => k8s.io/kubelet v0.19.0
67+
k8s.io/kubernetes => k8s.io/kubernetes v1.19.0
68+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.19.0
69+
k8s.io/metrics => k8s.io/metrics v0.19.0
70+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0
7571
)

0 commit comments

Comments
 (0)