Files
kubernetes/pkg/controller
Kubernetes Submit Queue ccb9590a3b Merge pull request #63386 from roycaihw/gc-json-patch
Automatic merge from submit-queue (batch tested with PRs 63386, 64624, 62297, 64847). 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>.

Let the garbage collector use json merge patch when SMP is not supported

**What this PR does / why we need it**:
Let garbage collector fallback to use json merge patch when strategic merge patch returns 415. This enables orphan delete on custom resources. 

**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 #56348

**Special notes for your reviewer**:
This PR is developed based on https://github.com/kubernetes/kubernetes/pull/56595. Ref https://github.com/kubernetes/kubernetes/pull/56606 for more information. 

**Release note**:

```release-note
Orphan delete is now supported for custom resources
```

/sig api-machinery
2018-06-06 19:56:20 -07:00
..
2018-04-27 07:56:42 -04:00
2018-05-11 13:12:09 -04:00
2018-05-30 14:46:48 +02:00
2018-02-16 13:43:01 -08:00
2018-06-05 04:50:37 -04:00
2018-04-01 18:57:29 +10:00
2018-02-16 13:43:01 -08:00
2018-05-22 13:42:10 -07:00
2017-11-14 17:18:17 +08:00