Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1873043: Rebase to kube 1.19.2 #25659

Merged
merged 1 commit into from
Nov 10, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
82 changes: 41 additions & 41 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ require (
github.com/onsi/ginkgo v4.5.0-origin.1+incompatible
github.com/onsi/gomega v1.7.0
github.com/opencontainers/go-digest v1.0.0-rc1
github.com/openshift/api v0.0.0-20200829102639-8a3a835f1acf
github.com/openshift/apiserver-library-go v0.0.0-20200901140731-1236dc23c728
github.com/openshift/build-machinery-go v0.0.0-20200819073603-48aa266c95f7
github.com/openshift/client-go v0.0.0-20200827190008-3062137373b5
github.com/openshift/library-go v0.0.0-20200902112127-a4e32e339219
github.com/openshift/api v0.0.0-20201102162614-9252afb032e1
github.com/openshift/apiserver-library-go v0.0.0-20201020095023-fe92bc0abdc3
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab
github.com/openshift/client-go v0.0.0-20201020082437-7737f16e53fc
github.com/openshift/library-go v0.0.0-20201102091359-c4fa0f5b3a08
github.com/pborman/uuid v1.2.0
github.com/pquerna/cachecontrol v0.0.0-00010101000000-000000000000 // indirect
github.com/prometheus/client_golang v1.7.1
Expand All @@ -58,19 +58,19 @@ require (
google.golang.org/grpc v1.27.1
gopkg.in/src-d/go-git.v4 v4.13.1
gopkg.in/yaml.v2 v2.3.0
k8s.io/api v0.19.0
k8s.io/apiextensions-apiserver v0.19.0
k8s.io/apimachinery v0.19.0
k8s.io/apiserver v0.19.0
k8s.io/cli-runtime v0.19.0-rc.2
k8s.io/client-go v0.19.0
k8s.io/component-base v0.19.0
k8s.io/api v0.19.2
k8s.io/apiextensions-apiserver v0.19.2
k8s.io/apimachinery v0.19.2
k8s.io/apiserver v0.19.2
k8s.io/cli-runtime v0.19.2
k8s.io/client-go v0.19.2
k8s.io/component-base v0.19.2
k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6
k8s.io/kubectl v0.0.0
k8s.io/kubelet v0.0.0
k8s.io/kubernetes v1.19.0
k8s.io/legacy-cloud-providers v0.0.0
k8s.io/kubectl v0.19.2
k8s.io/kubelet v0.19.2
k8s.io/kubernetes v1.19.2
k8s.io/legacy-cloud-providers v0.19.2
sigs.k8s.io/yaml v1.2.0
)

Expand Down Expand Up @@ -191,7 +191,7 @@ replace (
github.com/godbus/dbus => github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f
github.com/gogo/protobuf => github.com/gogo/protobuf v1.3.1
github.com/golang/freetype => github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
github.com/golang/glog => github.com/openshift/golang-glog v0.0.0-20190322123450-3c92600d7533
github.com/golang/glog => github.com/openshift/golang-glog v0.0.0-20160126235308-23def4e6c14b
github.com/golang/groupcache => github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903
github.com/golang/mock => github.com/golang/mock v1.3.1
github.com/golang/protobuf => github.com/golang/protobuf v1.3.2
Expand Down Expand Up @@ -417,34 +417,34 @@ replace (
gotest.tools/gotestsum => gotest.tools/gotestsum v0.3.5
grpc.go4.org => grpc.go4.org v0.0.0-20170609214715-11d0a25b4919
honnef.co/go/tools => honnef.co/go/tools v0.0.1-2019.2.2
k8s.io/api => k8s.io/api v0.19.0-rc.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.0-rc.2
k8s.io/apimachinery => k8s.io/apimachinery v0.19.0-rc.2
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20201031122226-74d9cb516f0f
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.0-rc.2
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20201031122226-74d9cb516f0f
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20201031122226-74d9cb516f0f
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.0-rc.2
k8s.io/code-generator => k8s.io/code-generator v0.19.0-rc.2
k8s.io/component-base => k8s.io/component-base v0.19.0-rc.2
k8s.io/cri-api => k8s.io/cri-api v0.19.0-rc.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.0-rc.2
k8s.io/api => k8s.io/api v0.19.2
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.19.2
k8s.io/apimachinery => k8s.io/apimachinery v0.19.2
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20201103091224-6bd0f342e442
k8s.io/cli-runtime => k8s.io/cli-runtime v0.19.2
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20201103091224-6bd0f342e442
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20201103091224-6bd0f342e442
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.19.2
k8s.io/code-generator => k8s.io/code-generator v0.19.2
k8s.io/component-base => k8s.io/component-base v0.19.2
k8s.io/cri-api => k8s.io/cri-api v0.19.2
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.19.2
k8s.io/gengo => k8s.io/gengo v0.0.0-20200114144118-36b2048a9120
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
k8s.io/klog => k8s.io/klog v1.0.0
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20201031122226-74d9cb516f0f
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.0-rc.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.0-rc.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.0-rc.2
k8s.io/kubectl => k8s.io/kubectl v0.19.0-rc.2
k8s.io/kubelet => k8s.io/kubelet v0.19.0-rc.2
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-alpha.0.0.20201031122226-74d9cb516f0f
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20201031122226-74d9cb516f0f
k8s.io/metrics => k8s.io/metrics v0.19.0-rc.2
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20201103091224-6bd0f342e442
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.19.2
k8s.io/kube-proxy => k8s.io/kube-proxy v0.19.2
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.19.2
k8s.io/kubectl => k8s.io/kubectl v0.19.2
k8s.io/kubelet => k8s.io/kubelet v0.19.2
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.0-alpha.0.0.20201103091224-6bd0f342e442
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20201103091224-6bd0f342e442
k8s.io/metrics => k8s.io/metrics v0.19.2
k8s.io/repo-infra => k8s.io/repo-infra v0.0.1-alpha.1
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.0-rc.2
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.0-rc.2
k8s.io/sample-controller => k8s.io/sample-controller v0.19.0-rc.2
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.19.2
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.19.2
k8s.io/sample-controller => k8s.io/sample-controller v0.19.2
k8s.io/system-validators => k8s.io/system-validators v1.0.4
k8s.io/utils => k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89
modernc.org/cc => modernc.org/cc v1.0.0
Expand Down