From fb11415a6907888731f75d587695a3662ca6ad1d Mon Sep 17 00:00:00 2001 From: Lionel Jouin Date: Tue, 4 Feb 2025 20:11:37 +0100 Subject: [PATCH] add simpletype pkg in v1 for register-gen test Signed-off-by: Lionel Jouin --- .../output_tests/simpletype/{ => v1}/doc.go | 3 +-- .../simpletype/{ => v1}/fake_deepcopy.go | 2 +- .../output_tests/simpletype/{ => v1}/types.go | 2 +- .../simpletype/{ => v1}/zz_generated.register.go | 12 ++++++------ staging/src/k8s.io/code-generator/go.mod | 2 +- staging/src/k8s.io/code-generator/go.sum | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) rename staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/{ => v1}/doc.go (92%) rename staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/{ => v1}/fake_deepcopy.go (98%) rename staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/{ => v1}/types.go (97%) rename staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/{ => v1}/zz_generated.register.go (89%) diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/doc.go b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/doc.go similarity index 92% rename from staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/doc.go rename to staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/doc.go index 8c3b819e019..07b9bb95e3b 100644 --- a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/doc.go +++ b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/doc.go @@ -16,5 +16,4 @@ limitations under the License. // +k8s:register-gen=simpletype -// +groupName=simpletype.foo.bar -package simpletype +package v1 diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/fake_deepcopy.go b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/fake_deepcopy.go similarity index 98% rename from staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/fake_deepcopy.go rename to staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/fake_deepcopy.go index 7a286022479..5f87053d92f 100644 --- a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/fake_deepcopy.go +++ b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/fake_deepcopy.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package simpletype +package v1 import ( "k8s.io/apimachinery/pkg/runtime" diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/types.go b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/types.go similarity index 97% rename from staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/types.go rename to staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/types.go index 5ebd211ee45..9788ca68778 100644 --- a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/types.go +++ b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/types.go @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -package simpletype +package v1 import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/zz_generated.register.go b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/zz_generated.register.go similarity index 89% rename from staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/zz_generated.register.go rename to staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/zz_generated.register.go index ca1fef67419..1dcc5674a7b 100644 --- a/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/zz_generated.register.go +++ b/staging/src/k8s.io/code-generator/cmd/register-gen/output_tests/simpletype/v1/zz_generated.register.go @@ -19,23 +19,23 @@ limitations under the License. // Code generated by register-gen. DO NOT EDIT. -package simpletype +package v1 import ( - v1 "k8s.io/apimachinery/pkg/apis/meta/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" runtime "k8s.io/apimachinery/pkg/runtime" schema "k8s.io/apimachinery/pkg/runtime/schema" ) // GroupName specifies the group name used to register the objects. -const GroupName = "simpletype.foo.bar" +const GroupName = "simpletype" // GroupVersion specifies the group and the version used to register the objects. -var GroupVersion = v1.GroupVersion{Group: GroupName, Version: "simpletype"} +var GroupVersion = metav1.GroupVersion{Group: GroupName, Version: "v1"} // SchemeGroupVersion is group version used to register these objects // Deprecated: use GroupVersion instead. -var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "simpletype"} +var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} // Resource takes an unqualified resource and returns a Group qualified GroupResource func Resource(resource string) schema.GroupResource { @@ -64,6 +64,6 @@ func addKnownTypes(scheme *runtime.Scheme) error { &SimpleType{}, ) // AddToGroupVersion allows the serialization of client types like ListOptions. - v1.AddToGroupVersion(scheme, SchemeGroupVersion) + metav1.AddToGroupVersion(scheme, SchemeGroupVersion) return nil } diff --git a/staging/src/k8s.io/code-generator/go.mod b/staging/src/k8s.io/code-generator/go.mod index 014e43d74f6..826f97d1a7c 100644 --- a/staging/src/k8s.io/code-generator/go.mod +++ b/staging/src/k8s.io/code-generator/go.mod @@ -36,7 +36,7 @@ require ( github.com/modern-go/reflect2 v1.0.2 // indirect github.com/x448/float16 v0.8.4 // indirect golang.org/x/mod v0.21.0 // indirect - golang.org/x/net v0.30.0 // indirect + golang.org/x/net v0.33.0 // indirect golang.org/x/sync v0.10.0 // indirect golang.org/x/sys v0.28.0 // indirect golang.org/x/tools v0.26.0 // indirect diff --git a/staging/src/k8s.io/code-generator/go.sum b/staging/src/k8s.io/code-generator/go.sum index d04760cc955..df056055c55 100644 --- a/staging/src/k8s.io/code-generator/go.sum +++ b/staging/src/k8s.io/code-generator/go.sum @@ -87,7 +87,7 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5t golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.28.0/go.mod h1:rmgy+3RHxRZMyY0jjAJShp2zgEdOqj2AO7U0pYmeQ7U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0= @@ -109,7 +109,7 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/telemetry v0.0.0-20240521205824-bda55230c457/go.mod h1:pRgIJT+bRLFKnoM1ldnzKoxTIn14Yxz928LQRYYgIN0= -golang.org/x/term v0.25.0/go.mod h1:RPyXicDX+6vLxogjjRxjgD2TKtmAO6NZBsBRfrOLu7M= +golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=