Merge pull request #108126 from sanposhiho/doc/generatedname

fix the doc about generateName conflict

Kubernetes-commit: 1ea07d482a5ec15afac5ea837585174579fc0f57

go.mod

@@ -12,23 +12,23 @@ require (
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd
-	k8s.io/api v0.0.0-20220328211228-e43e442d69ae
-	k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1
-	k8s.io/apiserver v0.0.0-20220329012309-7629acd5c8a1
-	k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad
-	k8s.io/code-generator v0.0.0-20220327010549-a207ba43f29b
-	k8s.io/component-base v0.0.0-20220329011822-14802e041799
+	k8s.io/api v0.0.0-20220329085248-f457c96d1ad5
+	k8s.io/apimachinery v0.0.0-20220329130813-31e52c987dc1
+	k8s.io/apiserver v0.0.0-20220329131945-e4a0d4ca4925
+	k8s.io/client-go v0.0.0-20220329091314-94a1081fafd8
+	k8s.io/code-generator v0.0.0-20220329130608-15a5f67a8af0
+	k8s.io/component-base v0.0.0-20220329051641-59f2f1feee51
 	k8s.io/klog/v2 v2.60.1
 	k8s.io/kube-openapi v0.0.0-20220324211241-9f9c01d62a3a
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20220328211228-e43e442d69ae
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1
-	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220329012309-7629acd5c8a1
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220327010549-a207ba43f29b
-	k8s.io/component-base => k8s.io/component-base v0.0.0-20220329011822-14802e041799
+	k8s.io/api => k8s.io/api v0.0.0-20220329085248-f457c96d1ad5
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220329130813-31e52c987dc1
+	k8s.io/apiserver => k8s.io/apiserver v0.0.0-20220329131945-e4a0d4ca4925
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20220329091314-94a1081fafd8
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220329130608-15a5f67a8af0
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20220329051641-59f2f1feee51
 )

go.sum

@@ -948,18 +948,18 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-k8s.io/api v0.0.0-20220328211228-e43e442d69ae h1:+fTlmPHEkWNRmZXwTXjYOO3s8vE7jDc95lnVBo04VOg=
-k8s.io/api v0.0.0-20220328211228-e43e442d69ae/go.mod h1:B54F1cQefRZjrzjwT8tJgapXYrUho8Lr/KcTpdLWhyU=
-k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1 h1:VaUIEA4wzN15Ak47QL3NBB4pdwQKe5tCztCLTK+8Fnw=
-k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1/go.mod h1:WkN7hnr/sIpKTK8v3BZKqLkdqTMz00TBdMWqE0M0O7Q=
-k8s.io/apiserver v0.0.0-20220329012309-7629acd5c8a1 h1:mZaSBvqy0l+znGTCtTFpOG595cFBmeOVxjueECEq00w=
-k8s.io/apiserver v0.0.0-20220329012309-7629acd5c8a1/go.mod h1:IRPei7vDtk4BQfDU+G/EI5K3K7wodMrXI32K44JHke0=
-k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad h1:v2udgOBdg/+3kM7nGJtQfjvnlsjgA0wdR9sJjiX7UfQ=
-k8s.io/client-go v0.0.0-20220327011239-402aa66c5cad/go.mod h1:HCq7QlEN/lEZ7hg4X9ldPo4rbktT3jtB83/5IJmurlw=
-k8s.io/code-generator v0.0.0-20220327010549-a207ba43f29b h1:/W7LKW7INcyQg+4t9MiVKiAcNEfcEJKr3GNFwJTXwaM=
-k8s.io/code-generator v0.0.0-20220327010549-a207ba43f29b/go.mod h1:K+f3PS8AJPkGO9NJoAqq6J1NMsr37Ey1IaQrQ2c97yQ=
-k8s.io/component-base v0.0.0-20220329011822-14802e041799 h1:sJYrDypDb6NyYAOwRokukSN277E1Z9KxgDyKRgnaDMA=
-k8s.io/component-base v0.0.0-20220329011822-14802e041799/go.mod h1:ImQZ3G+ZtZ7YrD/dBINMuNXz2H+yFgmp0jY7kWvicVA=
+k8s.io/api v0.0.0-20220329085248-f457c96d1ad5 h1:TXyh1FXkZDbvc5kgfNe3TIiOZWCmkrp/ZpvHdFEJxWc=
+k8s.io/api v0.0.0-20220329085248-f457c96d1ad5/go.mod h1:9dsqcUbHQ0TcKcDbIZizDq/CAc9ZzLsdgUQ0EE1Jqbo=
+k8s.io/apimachinery v0.0.0-20220329130813-31e52c987dc1 h1:ESix+UawmXFu9oem7ngnHSbufLCiIQrvn9TXHB1x/w4=
+k8s.io/apimachinery v0.0.0-20220329130813-31e52c987dc1/go.mod h1:WkN7hnr/sIpKTK8v3BZKqLkdqTMz00TBdMWqE0M0O7Q=
+k8s.io/apiserver v0.0.0-20220329131945-e4a0d4ca4925 h1:26zSJatONtqnC/DXxvdg3sJClvvQPoWcMy8yTJtXSWw=
+k8s.io/apiserver v0.0.0-20220329131945-e4a0d4ca4925/go.mod h1:2+467adXigrqQE54oKm0ioPO5ZsoEpoe5giRlu46up8=
+k8s.io/client-go v0.0.0-20220329091314-94a1081fafd8 h1:VmxceevfkORQc/j4wPYl+DxX4I3zgRYzNyL/NtbU9co=
+k8s.io/client-go v0.0.0-20220329091314-94a1081fafd8/go.mod h1:r5XwHVMi90Hb2U6aj1EE2C8sHXRrkaFfgVBnTw889Ck=
+k8s.io/code-generator v0.0.0-20220329130608-15a5f67a8af0 h1:aHPB8Hp9bo0YzBflUGpe0FqGmWSEAKcJWDcoQNKP6PA=
+k8s.io/code-generator v0.0.0-20220329130608-15a5f67a8af0/go.mod h1:K+f3PS8AJPkGO9NJoAqq6J1NMsr37Ey1IaQrQ2c97yQ=
+k8s.io/component-base v0.0.0-20220329051641-59f2f1feee51 h1:AI0vRA5cLetMNCGUpoPDsOeMmnjrh3kxvppvtN+osTw=
+k8s.io/component-base v0.0.0-20220329051641-59f2f1feee51/go.mod h1:URhW+V/OROyYt47UpSA+faMtPWsMecoLBv7efKyy1do=
 k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
 k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 h1:TT1WdmqqXareKxZ/oNXEUSwKlLiHzPMyB0t8BaFeBYI=
 k8s.io/gengo v0.0.0-20211129171323-c02415ce4185/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=