k3s/staging/src/k8s.io
Kubernetes Submit Queue 877ee91930 Merge pull request #51082 from caesarxuchao/repair-null-pending-initializer
Automatic merge from submit-queue (batch tested with PRs 50953, 51082)

Fix mergekey of initializers; Repair invalid update of initializers

Fix https://github.com/kubernetes/kubernetes/issues/51131

The PR did two things to make parallel patching `metadata.initializers.pending` possible:
* Add mergekey to initializers.pending
* Let the initializer admission plugin set the `metadata.intializers` to nil if an update makes the `pending` and the `result` both nil, instead of returning a validation error. Otherwise if multiple initializer controllers sending the patch removing themselves from `pending` at the same time, one of them will get a validation error.


```release-note
The patch to remove the last initializer from metadata.initializer.pending will result in metadata.initializer to be set to nil (assuming metadata.initializer.result is also nil), instead of resulting in an validation error.
```
2017-08-26 23:03:01 -07:00
..
api Merge pull request #49850 from m1093782566/service-session-timeout 2017-08-25 20:43:30 -07:00
apiextensions-apiserver Generated files 2017-08-25 15:01:08 -04:00
apimachinery Merge pull request #51082 from caesarxuchao/repair-null-pending-initializer 2017-08-26 23:03:01 -07:00
apiserver Merge pull request #49006 from CaoShuFeng/is_forbidden 2017-08-26 19:01:21 -07:00
client-go Call the right cleanup function 2017-08-25 08:12:58 +10:00
code-generator Revert "Ensure empty serialized slices are zero-length, not null" 2017-08-25 14:59:32 -04:00
kube-aggregator Generated files 2017-08-25 15:01:08 -04:00
metrics Generated files 2017-08-25 15:01:08 -04:00
sample-apiserver Generated files 2017-08-25 15:01:08 -04:00