Kubernetes Submit Queue 2879b2cb84 Merge pull request #44612 from nikhita/fix-patch-crash ...

Automatic merge from submit-queue

Fix kube-apiserver crash when patching TPR data

**What this PR does / why we need it**: While trying to do a strategic merge patch, kube-apiserver crashes with a nil pointer dereference because `UnsafeConvertor` is `nil` for TPR data resources here: https://github.com/kubernetes/kubernetes/blob/master/pkg/master/thirdparty/thirdparty.go#L314-L337.

This PR does not make strategic merge patch work on TPR data but makes sure that the kube-api server does not crash while trying to do so.

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

**Special notes for your reviewer**:

**Release note**:

```
NONE
```

2017-05-16 01:48:15 -07:00

..

BUILD

separate discovery from the apiserver

2017-05-02 08:50:43 -04:00

thirdparty.go

Merge pull request #44612 from nikhita/fix-patch-crash

2017-05-16 01:48:15 -07:00

tprregistration_controller_test.go

add controller to update apiservices based on tpr

2017-03-21 15:58:28 -04:00

tprregistration_controller.go

Make controller Run methods consistent

2017-04-14 07:27:45 -04:00