Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ replace (
k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210205160848-1fb0b6aa7392
k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210205160848-1fb0b6aa7392
k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210205160848-1fb0b6aa7392
k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210205160848-1fb0b6aa7392
//k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210205160848-1fb0b6aa7392
k8s.io/kubernetes => github.com/openshift-cherrypick-robot/kubernetes v1.20.0-alpha.0.0.20210207150445-0e8d123a9ad0
k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210205160848-1fb0b6aa7392
k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210205160848-1fb0b6aa7392
k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210205160848-1fb0b6aa7392
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,8 @@ github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6 h1:N
github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
github.com/opencontainers/selinux v1.6.0 h1:+bIAS/Za3q5FTwWym4fTB0vObnfCf3G/NC7K6Jx62mY=
github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
github.com/openshift-cherrypick-robot/kubernetes v1.20.0-alpha.0.0.20210207150445-0e8d123a9ad0 h1:ZvXMPrWbML5etZsGwc+4AYZhc2kAU0pITyKfZy/1/6U=
github.com/openshift-cherrypick-robot/kubernetes v1.20.0-alpha.0.0.20210207150445-0e8d123a9ad0/go.mod h1:WYL8/qQDpjRt1Rh9DNGRWe3V2ovnZnRJMffzC0gC1uc=
github.com/openshift/api v0.0.0-20201214114959-164a2fb63b5f h1:MhuCP7+M9hmUnZaz6EwOh3+W6FQp+BezIXbL99Q4xq4=
github.com/openshift/api v0.0.0-20201214114959-164a2fb63b5f/go.mod h1:aqU5Cq+kqKKPbDMqxo9FojgDeSpNJI7iuskjXjtojDg=
github.com/openshift/apiserver-library-go v0.0.0-20201214145556-6f1013f42f98 h1:JUz5O4PiBoEFhf/ZvwRary38hejR6E0LDEtyNro01TM=
Expand All @@ -629,8 +631,6 @@ github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab h1:lB
github.com/openshift/build-machinery-go v0.0.0-20200917070002-f171684f77ab/go.mod h1:b1BuldmJlbA/xYtdZvKi+7j5YGB44qJUJDZ9zwiNCfE=
github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49 h1:7NmjUkJtGHpMTE/n8ia6itbCdZ7eYuTCXKc/zsA7OSM=
github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49/go.mod h1:9/jG4I6sh+5QublJpZZ4Zs/P4/QCXMsQQ/K/058bSB8=
github.com/openshift/kubernetes v1.20.1-0.20210205160848-1fb0b6aa7392 h1:vGmEp1aDw9U30IPsbbYh2daJnQ0jN/Bt60Qc9rNDslE=
github.com/openshift/kubernetes v1.20.1-0.20210205160848-1fb0b6aa7392/go.mod h1:WYL8/qQDpjRt1Rh9DNGRWe3V2ovnZnRJMffzC0gC1uc=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210205160848-1fb0b6aa7392 h1:7ewP7GkyG0UQd9LHl8W+T6JeZbvQdsG4pEH2+h8P76g=
github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210205160848-1fb0b6aa7392/go.mod h1:12gqmOZJjmP0ciWfqR5ANIxYgDdTchaRCQx+nTGBtm4=
github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210205160848-1fb0b6aa7392 h1:ojHXaZVsWGZjRbkFdv6e7RCrAR5SIBPMPm1mqYc6Fec=
Expand Down
1 change: 1 addition & 0 deletions vendor/k8s.io/kubernetes/test/e2e/apimachinery/BUILD

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

107 changes: 107 additions & 0 deletions vendor/k8s.io/kubernetes/test/e2e/apimachinery/request_timeout.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions vendor/k8s.io/kubernetes/test/e2e/scheduling/ubernetes_lite.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2079,7 +2079,7 @@ k8s.io/kubelet/pkg/apis/pluginregistration/v1
k8s.io/kubelet/pkg/apis/podresources/v1
k8s.io/kubelet/pkg/apis/podresources/v1alpha1
k8s.io/kubelet/pkg/apis/stats/v1alpha1
# k8s.io/kubernetes v1.20.0 => github.com/openshift/kubernetes v1.20.1-0.20210205160848-1fb0b6aa7392
# k8s.io/kubernetes v1.20.0 => github.com/openshift-cherrypick-robot/kubernetes v1.20.0-alpha.0.0.20210207150445-0e8d123a9ad0
## explicit
k8s.io/kubernetes/cmd/kube-apiserver/app
k8s.io/kubernetes/cmd/kube-apiserver/app/options
Expand Down Expand Up @@ -2952,7 +2952,7 @@ sigs.k8s.io/yaml
# k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210205160848-1fb0b6aa7392
# k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210205160848-1fb0b6aa7392
# k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210205160848-1fb0b6aa7392
# k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210205160848-1fb0b6aa7392
# k8s.io/kubernetes => github.com/openshift-cherrypick-robot/kubernetes v1.20.0-alpha.0.0.20210207150445-0e8d123a9ad0
# k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210205160848-1fb0b6aa7392
# k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210205160848-1fb0b6aa7392
# k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210205160848-1fb0b6aa7392
Expand Down