kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108126 from sanposhiho/doc/generatedname 

fix the doc about generateName conflict

Kubernetes-commit: 1ea07d482a5ec15afac5ea837585174579fc0f57
This commit is contained in:
Kubernetes Publisher 2022-03-29 02:58:47 -07:00
parent 71c435eb19 32d585df37
commit 78438c15ae
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
go.mod
View File

@ -31,10 +31,10 @@ require (
github.com/stretchr/testify v1.7.0 github.com/stretchr/testify v1.7.0
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 golang.org/x/sys v0.0.0-20220209214540-3681064d5158
gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.0.0-20220329011000-b0917526c547 k8s.io/api v0.0.0-20220329085248-f457c96d1ad5
k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1 k8s.io/apimachinery v0.0.0-20220329130813-31e52c987dc1
k8s.io/cli-runtime v0.0.0-20220329053136-233dcaba1fc2 k8s.io/cli-runtime v0.0.0-20220329133126-053a01944821
k8s.io/client-go v0.0.0-20220329051259-11ca265357ae k8s.io/client-go v0.0.0-20220329091314-94a1081fafd8
k8s.io/component-base v0.0.0-20220329051641-59f2f1feee51 k8s.io/component-base v0.0.0-20220329051641-59f2f1feee51
k8s.io/component-helpers v0.0.0-20220329051751-76fc5e36ae3a k8s.io/component-helpers v0.0.0-20220329051751-76fc5e36ae3a
k8s.io/klog/v2 v2.60.1 k8s.io/klog/v2 v2.60.1
@ -48,11 +48,11 @@ require (
) )
replace ( replace (
k8s.io/api => k8s.io/api v0.0.0-20220329011000-b0917526c547 k8s.io/api => k8s.io/api v0.0.0-20220329085248-f457c96d1ad5
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1 k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20220329130813-31e52c987dc1
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220329053136-233dcaba1fc2 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20220329133126-053a01944821
k8s.io/client-go => k8s.io/client-go v0.0.0-20220329051259-11ca265357ae k8s.io/client-go => k8s.io/client-go v0.0.0-20220329091314-94a1081fafd8
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20220329043711-c77150097623 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 k8s.io/component-base => k8s.io/component-base v0.0.0-20220329051641-59f2f1feee51
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220329051751-76fc5e36ae3a k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20220329051751-76fc5e36ae3a
k8s.io/metrics => k8s.io/metrics v0.0.0-20220329053021-dc6ff944cbd1 k8s.io/metrics => k8s.io/metrics v0.0.0-20220329053021-dc6ff944cbd1

18
go.sum
View File

@ -851,15 +851,15 @@ 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-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.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
honnef.co/go/tools v0.0.1-2020.1.4/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-20220329011000-b0917526c547 h1:jeis0+znnEkhzTrX424mzp+MGnsBZjT0e7p6IgDm6as= k8s.io/api v0.0.0-20220329085248-f457c96d1ad5 h1:TXyh1FXkZDbvc5kgfNe3TIiOZWCmkrp/ZpvHdFEJxWc=
k8s.io/api v0.0.0-20220329011000-b0917526c547/go.mod h1:9dsqcUbHQ0TcKcDbIZizDq/CAc9ZzLsdgUQ0EE1Jqbo= k8s.io/api v0.0.0-20220329085248-f457c96d1ad5/go.mod h1:9dsqcUbHQ0TcKcDbIZizDq/CAc9ZzLsdgUQ0EE1Jqbo=
k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1 h1:VaUIEA4wzN15Ak47QL3NBB4pdwQKe5tCztCLTK+8Fnw= k8s.io/apimachinery v0.0.0-20220329130813-31e52c987dc1 h1:ESix+UawmXFu9oem7ngnHSbufLCiIQrvn9TXHB1x/w4=
k8s.io/apimachinery v0.0.0-20220328200121-3b8fb46ed6f1/go.mod h1:WkN7hnr/sIpKTK8v3BZKqLkdqTMz00TBdMWqE0M0O7Q= k8s.io/apimachinery v0.0.0-20220329130813-31e52c987dc1/go.mod h1:WkN7hnr/sIpKTK8v3BZKqLkdqTMz00TBdMWqE0M0O7Q=
k8s.io/cli-runtime v0.0.0-20220329053136-233dcaba1fc2 h1:VbYtT5NxhdZGmAl4BxTD72K9/X7Av3nZORX7KJHEbYo= k8s.io/cli-runtime v0.0.0-20220329133126-053a01944821 h1:OX3/DwGpXAiDsiKqMpmQYPUX2nEFvdGk8TU+AeUht6c=
k8s.io/cli-runtime v0.0.0-20220329053136-233dcaba1fc2/go.mod h1:IXCW0eYBFmZNIy8ogio80WeyuvA6HohOX6ib897+AA0= k8s.io/cli-runtime v0.0.0-20220329133126-053a01944821/go.mod h1:lOklRIDTcen9/8KLP49hf8iHEJfqgJhVyBfG/bQDDMY=
k8s.io/client-go v0.0.0-20220329051259-11ca265357ae h1:XCm/VyIyOC2WVUGP4PdV/vKwPzRNmv+6fiaqY6W1fdg= k8s.io/client-go v0.0.0-20220329091314-94a1081fafd8 h1:VmxceevfkORQc/j4wPYl+DxX4I3zgRYzNyL/NtbU9co=
k8s.io/client-go v0.0.0-20220329051259-11ca265357ae/go.mod h1:fldgOEv1xvWIbTcpmsGWqN/cWeffDxhSRZePPFfdHDY= k8s.io/client-go v0.0.0-20220329091314-94a1081fafd8/go.mod h1:r5XwHVMi90Hb2U6aj1EE2C8sHXRrkaFfgVBnTw889Ck=
k8s.io/code-generator v0.0.0-20220329043711-c77150097623/go.mod h1:K+f3PS8AJPkGO9NJoAqq6J1NMsr37Ey1IaQrQ2c97yQ= 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 h1:AI0vRA5cLetMNCGUpoPDsOeMmnjrh3kxvppvtN+osTw=
k8s.io/component-base v0.0.0-20220329051641-59f2f1feee51/go.mod h1:URhW+V/OROyYt47UpSA+faMtPWsMecoLBv7efKyy1do= k8s.io/component-base v0.0.0-20220329051641-59f2f1feee51/go.mod h1:URhW+V/OROyYt47UpSA+faMtPWsMecoLBv7efKyy1do=
k8s.io/component-helpers v0.0.0-20220329051751-76fc5e36ae3a h1:KNz1bMOaFF6IdJophzOAeDHhlg/zVIdNBE1/DI5zq+w= k8s.io/component-helpers v0.0.0-20220329051751-76fc5e36ae3a h1:KNz1bMOaFF6IdJophzOAeDHhlg/zVIdNBE1/DI5zq+w=

2
testdata/openapi/swagger.json vendored
View File

@ -18960,7 +18960,7 @@
"x-kubernetes-patch-strategy": "merge" "x-kubernetes-patch-strategy": "merge"
}, },
"generateName": { "generateName": {
"description": "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will NOT return a 409 - instead, it will either return 201 Created or 500 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).\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency", "description": "GenerateName is an optional prefix, used by the server, to generate a unique name ONLY IF the Name field has not been provided. If this field is used, the name returned to the client will be different than the name passed. This value will also be combined with a unique suffix. The provided value has the same validation rules as the Name field, and may be truncated by the length of the suffix required to make the value unique on the server.\n\nIf this field is specified and the generated name exists, the server will return a 409.\n\nApplied only if Name is not specified. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#idempotency",
"type": "string" "type": "string"
}, },
"generation": { "generation": {