Merge pull request #18430 from smarterclayton/terminate_early

Automatic merge from submit-queue (batch tested with PRs 18666, 18810, 18430, 18517, 18653). UPSTREAM: 59316: Exit if no client cert is available for 5m
openshift · Mar 6, 2018 · 0a8f794 · 0a8f794
2 parents fa91b09 + b9d61bd
commit 0a8f794
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 12 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/certificate/transport.go b/vendor/k8s.io/kubernetes/pkg/kubelet/certificate/transport.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/certificate/transport_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/certificate/transport_test.go
diff --git a/...or/k8s.io/kubernetes/staging/src/k8s.io/client-go/util/certificate/certificate_manager.go b/...or/k8s.io/kubernetes/staging/src/k8s.io/client-go/util/certificate/certificate_manager.go