mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Generators should reference metav1.ListOptions (informer,client,fake)
This commit is contained in:
parent
34e9e54ce1
commit
93e7c60ae0
@ -145,11 +145,10 @@ func (g *genFakeForType) GenerateType(c *generator.Context, t *types.Type, w io.
|
|||||||
|
|
||||||
if g.version == "" {
|
if g.version == "" {
|
||||||
m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"})
|
m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"})
|
||||||
m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ListOptions"})
|
|
||||||
} else {
|
} else {
|
||||||
m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "DeleteOptions"})
|
m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "DeleteOptions"})
|
||||||
m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "ListOptions"})
|
|
||||||
}
|
}
|
||||||
|
m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "ListOptions"})
|
||||||
m["GetOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "GetOptions"})
|
m["GetOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "GetOptions"})
|
||||||
|
|
||||||
noMethods := extractBoolTagOrDie("noMethods", t.SecondClosestCommentLines) == true
|
noMethods := extractBoolTagOrDie("noMethods", t.SecondClosestCommentLines) == true
|
||||||
|
@ -92,11 +92,10 @@ func (g *genClientForType) GenerateType(c *generator.Context, t *types.Type, w i
|
|||||||
|
|
||||||
if g.version == "" {
|
if g.version == "" {
|
||||||
m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"})
|
m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "DeleteOptions"})
|
||||||
m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "ListOptions"})
|
|
||||||
} else {
|
} else {
|
||||||
m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "DeleteOptions"})
|
m["DeleteOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "DeleteOptions"})
|
||||||
m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "ListOptions"})
|
|
||||||
}
|
}
|
||||||
|
m["ListOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "ListOptions"})
|
||||||
m["GetOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "GetOptions"})
|
m["GetOptions"] = c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "GetOptions"})
|
||||||
|
|
||||||
sw.Do(getterComment, m)
|
sw.Do(getterComment, m)
|
||||||
|
@ -69,16 +69,14 @@ func (g *informerGenerator) GenerateType(c *generator.Context, t *types.Type, w
|
|||||||
listerPackage := fmt.Sprintf("%s/%s/%s", g.listersPackage, g.groupVersion.Group.NonEmpty(), strings.ToLower(g.groupVersion.Version.NonEmpty()))
|
listerPackage := fmt.Sprintf("%s/%s/%s", g.listersPackage, g.groupVersion.Group.NonEmpty(), strings.ToLower(g.groupVersion.Version.NonEmpty()))
|
||||||
|
|
||||||
var (
|
var (
|
||||||
clientSetInterface, namespaceAll *types.Type
|
clientSetInterface *types.Type
|
||||||
informerFor string
|
informerFor string
|
||||||
)
|
)
|
||||||
if len(g.groupVersion.Version) == 0 {
|
if len(g.groupVersion.Version) == 0 {
|
||||||
clientSetInterface = c.Universe.Type(types.Name{Package: g.internalClientSetPackage, Name: "Interface"})
|
clientSetInterface = c.Universe.Type(types.Name{Package: g.internalClientSetPackage, Name: "Interface"})
|
||||||
namespaceAll = c.Universe.Type(apiNamespaceAll)
|
|
||||||
informerFor = "InternalInformerFor"
|
informerFor = "InternalInformerFor"
|
||||||
} else {
|
} else {
|
||||||
clientSetInterface = c.Universe.Type(types.Name{Package: g.versionedClientSetPackage, Name: "Interface"})
|
clientSetInterface = c.Universe.Type(types.Name{Package: g.versionedClientSetPackage, Name: "Interface"})
|
||||||
namespaceAll = c.Universe.Type(v1NamespaceAll)
|
|
||||||
informerFor = "VersionedInformerFor"
|
informerFor = "VersionedInformerFor"
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -96,7 +94,7 @@ func (g *informerGenerator) GenerateType(c *generator.Context, t *types.Type, w
|
|||||||
"interfacesSharedInformerFactory": c.Universe.Type(types.Name{Package: g.internalInterfacesPackage, Name: "SharedInformerFactory"}),
|
"interfacesSharedInformerFactory": c.Universe.Type(types.Name{Package: g.internalInterfacesPackage, Name: "SharedInformerFactory"}),
|
||||||
"listOptions": c.Universe.Type(listOptions),
|
"listOptions": c.Universe.Type(listOptions),
|
||||||
"lister": c.Universe.Type(types.Name{Package: listerPackage, Name: t.Name.Name + "Lister"}),
|
"lister": c.Universe.Type(types.Name{Package: listerPackage, Name: t.Name.Name + "Lister"}),
|
||||||
"namespaceAll": namespaceAll,
|
"namespaceAll": c.Universe.Type(metav1NamespaceAll),
|
||||||
"namespaced": !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines),
|
"namespaced": !extractBoolTagOrDie("nonNamespaced", t.SecondClosestCommentLines),
|
||||||
"newLister": c.Universe.Function(types.Name{Package: listerPackage, Name: "New" + t.Name.Name + "Lister"}),
|
"newLister": c.Universe.Function(types.Name{Package: listerPackage, Name: "New" + t.Name.Name + "Lister"}),
|
||||||
"runtimeObject": c.Universe.Type(runtimeObject),
|
"runtimeObject": c.Universe.Type(runtimeObject),
|
||||||
@ -140,18 +138,10 @@ func new$.type|public$Informer(client $.clientSetInterface|raw$, resyncPeriod $.
|
|||||||
sharedIndexInformer := $.cacheNewSharedIndexInformer|raw$(
|
sharedIndexInformer := $.cacheNewSharedIndexInformer|raw$(
|
||||||
&$.cacheListWatch|raw${
|
&$.cacheListWatch|raw${
|
||||||
ListFunc: func(options $.v1ListOptions|raw$) ($.runtimeObject|raw$, error) {
|
ListFunc: func(options $.v1ListOptions|raw$) ($.runtimeObject|raw$, error) {
|
||||||
var internalOptions $.listOptions|raw$
|
return client.$.group$$.version$().$.type|publicPlural$($if .namespaced$$.namespaceAll|raw$$end$).List(options)
|
||||||
if err := $.apiScheme|raw$.Convert(&options, &internalOptions, nil); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return client.$.group$$.version$().$.type|publicPlural$($if .namespaced$$.namespaceAll|raw$$end$).List(internalOptions)
|
|
||||||
},
|
},
|
||||||
WatchFunc: func(options $.v1ListOptions|raw$) ($.watchInterface|raw$, error) {
|
WatchFunc: func(options $.v1ListOptions|raw$) ($.watchInterface|raw$, error) {
|
||||||
var internalOptions $.listOptions|raw$
|
return client.$.group$$.version$().$.type|publicPlural$($if .namespaced$$.namespaceAll|raw$$end$).Watch(options)
|
||||||
if err := $.apiScheme|raw$.Convert(&options, &internalOptions, nil); err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
return client.$.group$$.version$().$.type|publicPlural$($if .namespaced$$.namespaceAll|raw$$end$).Watch(internalOptions)
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
&$.type|raw${},
|
&$.type|raw${},
|
||||||
|
@ -19,7 +19,6 @@ package generators
|
|||||||
import "k8s.io/gengo/types"
|
import "k8s.io/gengo/types"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
apiNamespaceAll = types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "NamespaceAll"}
|
|
||||||
apiScheme = types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "Scheme"}
|
apiScheme = types.Name{Package: "k8s.io/kubernetes/pkg/api", Name: "Scheme"}
|
||||||
cacheGenericLister = types.Name{Package: "k8s.io/kubernetes/pkg/client/cache", Name: "GenericLister"}
|
cacheGenericLister = types.Name{Package: "k8s.io/kubernetes/pkg/client/cache", Name: "GenericLister"}
|
||||||
cacheIndexers = types.Name{Package: "k8s.io/kubernetes/pkg/client/cache", Name: "Indexers"}
|
cacheIndexers = types.Name{Package: "k8s.io/kubernetes/pkg/client/cache", Name: "Indexers"}
|
||||||
@ -36,7 +35,7 @@ var (
|
|||||||
schemaGroupVersionResource = types.Name{Package: "k8s.io/apimachinery/pkg/runtime/schema", Name: "GroupVersionResource"}
|
schemaGroupVersionResource = types.Name{Package: "k8s.io/apimachinery/pkg/runtime/schema", Name: "GroupVersionResource"}
|
||||||
syncMutex = types.Name{Package: "sync", Name: "Mutex"}
|
syncMutex = types.Name{Package: "sync", Name: "Mutex"}
|
||||||
timeDuration = types.Name{Package: "time", Name: "Duration"}
|
timeDuration = types.Name{Package: "time", Name: "Duration"}
|
||||||
v1ListOptions = types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "ListOptions"}
|
v1ListOptions = types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "ListOptions"}
|
||||||
v1NamespaceAll = types.Name{Package: "k8s.io/kubernetes/pkg/api/v1", Name: "NamespaceAll"}
|
metav1NamespaceAll = types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "NamespaceAll"}
|
||||||
watchInterface = types.Name{Package: "k8s.io/apimachinery/pkg/watch", Name: "Interface"}
|
watchInterface = types.Name{Package: "k8s.io/apimachinery/pkg/watch", Name: "Interface"}
|
||||||
)
|
)
|
||||||
|
Loading…
Reference in New Issue
Block a user