UPSTREAM: 96990: Increase preemption timeout from 1 minute to 2 minutes

go mod tidy && go mod vendor
openshift · Jan 20, 2021 · 2ab3d03 · 2ab3d03
1 parent 56333ce
commit 2ab3d03
Show file tree

Hide file tree

Showing 19 changed files with 97 additions and 167 deletions.
diff --git a/go.mod b/go.mod
@@ -102,7 +102,7 @@ replace (
 	k8s.io/kube-scheduler => github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20210107082038-74cd459bbb9c
 	k8s.io/kubectl => github.com/openshift/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20210107082038-74cd459bbb9c
 	k8s.io/kubelet => github.com/openshift/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20210107082038-74cd459bbb9c
-	k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210107082038-74cd459bbb9c
+	k8s.io/kubernetes => github.com/openshift/kubernetes v1.20.1-0.20210120003234-8012dc588ff8
 	k8s.io/legacy-cloud-providers => github.com/openshift/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20210107082038-74cd459bbb9c
 	k8s.io/metrics => github.com/openshift/kubernetes/staging/src/k8s.io/metrics v0.0.0-20210107082038-74cd459bbb9c
 	k8s.io/mount-utils => github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20210107082038-74cd459bbb9c

diff --git a/go.sum b/go.sum
@@ -631,6 +631,8 @@ github.com/openshift/client-go v0.0.0-20201214125552-e615e336eb49 h1:7NmjUkJtGHp
 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.20210107082038-74cd459bbb9c h1:4sZ0bT9t3H7AodgAnSg8CESajiECjnYvmjYn7C3Hw7k=
 github.com/openshift/kubernetes v1.20.1-0.20210107082038-74cd459bbb9c/go.mod h1:WYL8/qQDpjRt1Rh9DNGRWe3V2ovnZnRJMffzC0gC1uc=
+github.com/openshift/kubernetes v1.20.1-0.20210120003234-8012dc588ff8 h1:E3L2Xjfa9uS3bwV7cR4Mkkiw34eF4P+XUNmvebGg56I=
+github.com/openshift/kubernetes v1.20.1-0.20210120003234-8012dc588ff8/go.mod h1:WYL8/qQDpjRt1Rh9DNGRWe3V2ovnZnRJMffzC0gC1uc=
 github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210107082038-74cd459bbb9c h1:C9T0/uZK5AdSkUTFAZDB1489HRqZg1oVEmvFJ60Yr/o=
 github.com/openshift/kubernetes/staging/src/k8s.io/api v0.0.0-20210107082038-74cd459bbb9c/go.mod h1:12gqmOZJjmP0ciWfqR5ANIxYgDdTchaRCQx+nTGBtm4=
 github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20210107082038-74cd459bbb9c h1:VWfGa7/NJlArl+ZhUCrU3R6yV0HTcQSY2SRaJ0h8duo=

diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/container/runtime.go b/vendor/k8s.io/kubernetes/pkg/kubelet/container/runtime.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/container/testing/fake_runtime.go b/vendor/k8s.io/kubernetes/pkg/kubelet/container/testing/fake_runtime.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/container/testing/runtime_mock.go b/vendor/k8s.io/kubernetes/pkg/kubelet/container/testing/runtime_mock.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_pods.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_container.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_container.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_gc.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_gc.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kuberuntime/kuberuntime_sandbox.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/pod_sandbox_deleter.go b/vendor/k8s.io/kubernetes/pkg/kubelet/pod_sandbox_deleter.go
diff --git a/vendor/k8s.io/kubernetes/pkg/volume/BUILD b/vendor/k8s.io/kubernetes/pkg/volume/BUILD