Skip to content

Commit

Permalink
Merge pull request openshift#138 from squeed/bump-1.18
Browse files Browse the repository at this point in the history 
Bug 1826339: vendor: bump our k8s vendor
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot authored and Juan-Luis de Sousa-Valadas Castaño committed Jul 7, 2020
2 parents 100a929 + aa4d818 commit 64eebc7
Show file tree
Hide file tree
Showing 18 changed files with 281 additions and 207 deletions.
49 changes: 24 additions & 25 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ require (
github.com/fsnotify/fsnotify v1.4.7
github.com/gorilla/mux v1.7.4-0.20190830121156-884b5ffcbd3a
github.com/miekg/dns v1.1.4
github.com/opencontainers/runtime-spec v0.0.0-00010101000000-000000000000 // indirect
github.com/openshift/api v0.0.0-20200424083944-0422dc17083e
github.com/openshift/build-machinery-go v0.0.0-20200424080330-082bf86082cc
github.com/openshift/client-go v0.0.0-20200422192633-6f6c07fc2a70
Expand Down Expand Up @@ -68,30 +67,30 @@ replace (
github.com/spf13/pflag => github.com/spf13/pflag v1.0.5
github.com/vishvananda/netlink => ./patch/github.com/vishvananda/netlink
github.com/vishvananda/netns => github.com/vishvananda/netns v0.0.0-20170219233438-54f0e4339ce7
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20200506130333-d411faf4483c
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20200506130333-d411faf4483c
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20200506130333-d411faf4483c
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200506130333-d411faf4483c
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20200506130333-d411faf4483c
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200506130333-d411faf4483c
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200506130333-d411faf4483c
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20200506130333-d411faf4483c
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20200506130333-d411faf4483c
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20200506130333-d411faf4483c
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20200506130333-d411faf4483c
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20200506130333-d411faf4483c
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200506130333-d411faf4483c
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20200506130333-d411faf4483c
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20200506130333-d411faf4483c
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20200506130333-d411faf4483c
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20200506130333-d411faf4483c
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20200506130333-d411faf4483c
k8s.io/kubernetes => github.com/openshift/kubernetes v1.5.0-alpha.0.0.20200504100644-ad077cd883ae
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200506130333-d411faf4483c
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20200506130333-d411faf4483c
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20200506130333-d411faf4483c
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20200506130333-d411faf4483c
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20200506130333-d411faf4483c
k8s.io/api => github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20200506150957-662762e23e80
k8s.io/apiextensions-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20200506150957-662762e23e80
k8s.io/apimachinery => github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20200506150957-662762e23e80
k8s.io/apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20200506150957-662762e23e80
k8s.io/cli-runtime => github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20200506150957-662762e23e80
k8s.io/client-go => github.com/openshift/kubernetes/staging/src/k8s.io/client-go v0.0.0-20200506150957-662762e23e80
k8s.io/cloud-provider => github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20200506150957-662762e23e80
k8s.io/cluster-bootstrap => github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20200506150957-662762e23e80
k8s.io/code-generator => github.com/openshift/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20200506150957-662762e23e80
k8s.io/component-base => github.com/openshift/kubernetes/staging/src/k8s.io/component-base v0.0.0-20200506150957-662762e23e80
k8s.io/cri-api => github.com/openshift/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20200506150957-662762e23e80
k8s.io/csi-translation-lib => github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20200506150957-662762e23e80
k8s.io/kube-aggregator => github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20200506150957-662762e23e80
k8s.io/kube-controller-manager => github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20200506150957-662762e23e80
k8s.io/kube-proxy => github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20200506150957-662762e23e80
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20200506150957-662762e23e80
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20200506150957-662762e23e80
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20200506150957-662762e23e80
k8s.io/kubernetes => github.com/openshift/kubernetes v0.0.0-20200506150957-662762e23e80
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20200506150957-662762e23e80
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20200506150957-662762e23e80
k8s.io/sample-apiserver => github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20200506150957-662762e23e80
k8s.io/sample-cli-plugin => github.com/openshift/kubernetes/staging/src/k8s.io/sample-cli-plugin v0.0.0-20200506150957-662762e23e80
k8s.io/sample-controller => github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller v0.0.0-20200506150957-662762e23e80
k8s.io/utils => k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 // same as sdn-4.4-kubernetes-1.18.2
sigs.k8s.io/yaml => sigs.k8s.io/yaml v1.1.0
)

0 comments on commit 64eebc7

Please sign in to comment.