Merge pull request #113654 from stevekuznetsov/skuznets/fake-group-name-registration

code-generator: refer to the API package for GV{R,K}

Kubernetes-commit: c97dbd1afb815731cbebf9cb0d888a29c39e2b76
This commit is contained in:
Kubernetes Publisher 2023-01-05 02:23:59 -08:00
commit f642284f7b
3 changed files with 10 additions and 11 deletions

8
go.mod
View File

@ -7,8 +7,8 @@ go 1.19
require (
k8s.io/api v0.0.0-20221223233726-92fe7a3ca2f4
k8s.io/apimachinery v0.0.0-20230104022610-6c409361e35e
k8s.io/client-go v0.0.0-20230107075056-dc46266e11fa
k8s.io/code-generator v0.0.0-20230105024958-5013555b45c7
k8s.io/client-go v0.0.0-20230107075058-5ea7f43b5d11
k8s.io/code-generator v0.0.0-20230107073137-ba7883932b4c
k8s.io/klog/v2 v2.80.1
)
@ -59,6 +59,6 @@ require (
replace (
k8s.io/api => k8s.io/api v0.0.0-20221223233726-92fe7a3ca2f4
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20230104022610-6c409361e35e
k8s.io/client-go => k8s.io/client-go v0.0.0-20230107075056-dc46266e11fa
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230105024958-5013555b45c7
k8s.io/client-go => k8s.io/client-go v0.0.0-20230107075058-5ea7f43b5d11
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20230107073137-ba7883932b4c
)

8
go.sum
View File

@ -471,10 +471,10 @@ k8s.io/api v0.0.0-20221223233726-92fe7a3ca2f4 h1:xXF6vJObhLxxs90hdEZENpbta24zuE/
k8s.io/api v0.0.0-20221223233726-92fe7a3ca2f4/go.mod h1:7VeiiNXwWDDV/gC/WTZA9plPSLqAQnOrZaAyXJsAudE=
k8s.io/apimachinery v0.0.0-20230104022610-6c409361e35e h1:eJYyIfU4uOvJsSbI8fQkqQa+udeFbJDBUjw0I2F30k0=
k8s.io/apimachinery v0.0.0-20230104022610-6c409361e35e/go.mod h1:E7c0pLSvNLZyzn9NBKnVO5+N8E8J25dNmB4m9TyuirA=
k8s.io/client-go v0.0.0-20230107075056-dc46266e11fa h1:51frU9J10pc6B6x6BqRRkZXHL7pFz5zZHnujyaxtqzs=
k8s.io/client-go v0.0.0-20230107075056-dc46266e11fa/go.mod h1:iSe0LIKVehUQP1b8pJpWe09GqhCop0pmKcdSxw6GhXg=
k8s.io/code-generator v0.0.0-20230105024958-5013555b45c7 h1:TmJqT1FH3beLVMDDCo7rtFMst6AJOFE+A4qtW7NtM10=
k8s.io/code-generator v0.0.0-20230105024958-5013555b45c7/go.mod h1:9Z6QoH1eyEsep5TzIccdxcBIkw8OFASorouKJZdHsnI=
k8s.io/client-go v0.0.0-20230107075058-5ea7f43b5d11 h1:mny3ki6tkmKBEUQ+3cuOXm6uTnYfrZbt9A+Tja+wQCM=
k8s.io/client-go v0.0.0-20230107075058-5ea7f43b5d11/go.mod h1:iSe0LIKVehUQP1b8pJpWe09GqhCop0pmKcdSxw6GhXg=
k8s.io/code-generator v0.0.0-20230107073137-ba7883932b4c h1:pxTzWj70nWDE6uYw+JvNonXPZXR50bcHCJfsMcg4pGo=
k8s.io/code-generator v0.0.0-20230107073137-ba7883932b4c/go.mod h1:9Z6QoH1eyEsep5TzIccdxcBIkw8OFASorouKJZdHsnI=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d h1:U9tB195lKdzwqicbJvyJeOXV7Klv+wNAWENRnXEGi08=
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

View File

@ -23,7 +23,6 @@ import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
labels "k8s.io/apimachinery/pkg/labels"
schema "k8s.io/apimachinery/pkg/runtime/schema"
types "k8s.io/apimachinery/pkg/types"
watch "k8s.io/apimachinery/pkg/watch"
testing "k8s.io/client-go/testing"
@ -36,9 +35,9 @@ type FakeFoos struct {
ns string
}
var foosResource = schema.GroupVersionResource{Group: "samplecontroller.k8s.io", Version: "v1alpha1", Resource: "foos"}
var foosResource = v1alpha1.SchemeGroupVersion.WithResource("foos")
var foosKind = schema.GroupVersionKind{Group: "samplecontroller.k8s.io", Version: "v1alpha1", Kind: "Foo"}
var foosKind = v1alpha1.SchemeGroupVersion.WithKind("Foo")
// Get takes name of the foo, and returns the corresponding foo object, and an error if there is any.
func (c *FakeFoos) Get(ctx context.Context, name string, options v1.GetOptions) (result *v1alpha1.Foo, err error) {