Skip to content

Commit 7d093f4

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request cri-o#2936 from openSUSE/k8s-1.17
Bump kubernetes to v1.17.0-beta.0
2 parents f86353f + f6e8aef commit 7d093f4

File tree

205 files changed

+7543
-4374
lines changed

Some content is hidden

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

205 files changed

+7543
-4374
lines changed

‎go.mod‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ require (
2525
github.com/docker/go-units v0.4.0
2626
github.com/fsnotify/fsnotify v1.4.7
2727
github.com/go-zoo/bone v1.3.0
28-
github.com/godbus/dbus v4.1.0+incompatible
28+
github.com/godbus/dbus v0.0.0
2929
github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d
3030
github.com/golang/mock v1.3.1
3131
github.com/google/renameio v0.1.0
@@ -37,10 +37,10 @@ require (
3737
github.com/onsi/gomega v1.7.1
3838
github.com/opencontainers/go-digest v1.0.0-rc1
3939
github.com/opencontainers/image-spec v1.0.2-0.20190823105129-775207bd45b6
40-
github.com/opencontainers/runc v1.0.0-rc8.0.20190827142921-dd075602f158
40+
github.com/opencontainers/runc v1.0.0-rc9
4141
github.com/opencontainers/runtime-spec v1.0.1
4242
github.com/opencontainers/runtime-tools v0.9.0
43-
github.com/opencontainers/selinux v1.3.0
43+
github.com/opencontainers/selinux v1.3.1-0.20190929122143-5215b1806f52
4444
github.com/pkg/errors v0.8.1
4545
github.com/prometheus/client_golang v1.2.1
4646
github.com/seccomp/containers-golang v0.3.1
@@ -58,33 +58,33 @@ require (
5858
k8s.io/client-go v0.0.0
5959
k8s.io/cri-api v0.0.0
6060
k8s.io/kubernetes v0.0.0
61-
k8s.io/utils v0.0.0-20190920012459-5008bf6f8cd6
61+
k8s.io/utils v0.0.0-20191010214722-8d271d903fe4
6262
)
6363

6464
replace (
6565
github.com/godbus/dbus => github.com/godbus/dbus v0.0.0-20190623212516-8a1682060722
6666
github.com/opencontainers/runtime-spec => github.com/opencontainers/runtime-spec v0.1.2-0.20190408193819-a1b50f621a48
6767
github.com/prometheus/client_golang => github.com/prometheus/client_golang v0.9.2
68-
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20190913145653-2bd9643cee5b
69-
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20190913145653-2bd9643cee5b
70-
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20190913145653-2bd9643cee5b
71-
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20190913145653-2bd9643cee5b
72-
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20190913145653-2bd9643cee5b
73-
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20190913145653-2bd9643cee5b
74-
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20190913145653-2bd9643cee5b
75-
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20190913145653-2bd9643cee5b
76-
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20190913145653-2bd9643cee5b
77-
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20190913145653-2bd9643cee5b
78-
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20190913145653-2bd9643cee5b
79-
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20190913145653-2bd9643cee5b
80-
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20190913145653-2bd9643cee5b
81-
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20190913145653-2bd9643cee5b
82-
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20190913145653-2bd9643cee5b
83-
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20190913145653-2bd9643cee5b
84-
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20190913145653-2bd9643cee5b
85-
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20190913145653-2bd9643cee5b
86-
k8s.io/kubernetes => k8s.io/kubernetes v1.16.0
87-
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20190913145653-2bd9643cee5b
88-
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20190913145653-2bd9643cee5b
89-
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20190913145653-2bd9643cee5b
68+
k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20191029164530-fd61642e68bd
69+
k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20191029164530-fd61642e68bd
70+
k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20191029164530-fd61642e68bd
71+
k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20191029164530-fd61642e68bd
72+
k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20191029164530-fd61642e68bd
73+
k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20191029164530-fd61642e68bd
74+
k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20191029164530-fd61642e68bd
75+
k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20191029164530-fd61642e68bd
76+
k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20191029164530-fd61642e68bd
77+
k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20191029164530-fd61642e68bd
78+
k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20191029164530-fd61642e68bd
79+
k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20191029164530-fd61642e68bd
80+
k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20191029164530-fd61642e68bd
81+
k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20191029164530-fd61642e68bd
82+
k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20191029164530-fd61642e68bd
83+
k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20191029164530-fd61642e68bd
84+
k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20191029164530-fd61642e68bd
85+
k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20191029164530-fd61642e68bd
86+
k8s.io/kubernetes => k8s.io/kubernetes v1.17.0-beta.0
87+
k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20191029164530-fd61642e68bd
88+
k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20191029164530-fd61642e68bd
89+
k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20191029164530-fd61642e68bd
9090
)

0 commit comments

Comments
 (0)