Merge pull request #66963 from Lion-Wei/integration

Automatic merge from submit-queue (batch tested with PRs 66920, 67316, 67363, 67528, 66963). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

integration test run PreShutdownHooks before close.

**What this PR does / why we need it**:

**Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*:
Fixes #66962 

**Special notes for your reviewer**:
Run `PreShutdownHooks` before close master.

**Release note**:
```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-08-17 10:37:20 -07:00 committed by GitHub
commit 80b73d70a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions

View File

@ -119,6 +119,7 @@ func startMasterOrDie(masterConfig *master.Config, incomingServer *httptest.Serv
stopCh := make(chan struct{})
closeFn := func() {
m.GenericAPIServer.RunPreShutdownHooks()
close(stopCh)
s.Close()
}