Merge pull request #7063 from ninjaprox/patch-1

Correct `generateName` doc when in conflict

Author: k8s-ci-robot

contributors/devel/sig-architecture/api-conventions.md

@@ -724,17 +724,15 @@ same name as an existing object in the system. See
 
 Names generated by the system may be requested using `metadata.generateName`.
 GenerateName indicates that the name should be made unique by the server prior
-to persisting it. A non-empty value for the field indicates the name will be
-made unique (and the name returned to the client will be different than the name
-passed). The value of this field will be combined with a unique suffix on the
-server if the Name field has not been provided. The provided value must be valid
-within the rules for Name, and may be truncated by the length of the suffix
-required to make the value unique on the server. If this field is specified, and
-Name is not present, the server will NOT return a 409 if the generated name
-exists - instead, it will either return 201 Created or 504 with Reason
-`ServerTimeout` indicating a unique name could not be found in the time
-allotted, and the client should retry (optionally after the time indicated in
-the Retry-After header).
+to persisting it. A non-empty value for the field indicates the server should
+attempt to make the name unique (and the name returned to the client will be
+different than the name passed). The value of this field will be combined with a
+random suffix on the server if the Name field has not been provided. The
+provided value must be valid within the rules for Name, and may be truncated by
+the length of the suffix. If this field is specified, and Name is not present,
+the server will return a 409 with Reason `AlreadyExists` if the generated name
+exists, and the client should retry (after waiting at least the amount of time
+indicated in the Retry-After header, if it is present).
 
 ## Optional vs. Required