Skip to content

K
k3s
Commit 8e98f1df authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #45910 from seh/correct-tpr-example-registration

Automatic merge from submit-queue (batch tested with PRs 46133, 46211, 46224, 46205, 45910) Correct client-go TPR example type registration **What this PR does / why we need it**: Eliminate duplicate registration of third-party resource types in the _client-go_ example, precluding any number of readers from copying the mistake into their own applications as they adapt the example to their own needs. **Special notes for your reviewer**: See [the preceding discussion](https://github.com/kubernetes/kubernetes/commit/a6c97715ed7e24581dd9a02a256d57e56b70ac44#commitcomment-22146536) about a6c97715, committed as part of #45463 but only noticed after the merge. It's possible that we could take a few of the changes proposed here and apply them more broadly throughout the rest of the code, such as not exporting the `AddToScheme` var in favor of an actual function declaration. Given the flux in #44784, I'd prefer that we don't hold up these small touch-ups on a broader unification. People I expect will want to weigh in: @sttts, @caesarxuchao, and @nilebox.
parents a572f103 3a8e44bd
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 11 deletions
staging/src/k8s.io/client-go/examples/third-party-resources/apis/tpr/v1/register.go
View file @ 8e98f1df
...@@ -27,25 +27,18 @@ var ( ...@@ -27,25 +27,18 @@ var (
AddToScheme = SchemeBuilder.AddToScheme AddToScheme = SchemeBuilder.AddToScheme
) )
// GroupName is the group name use in this package // GroupName is the group name use in this package.
const GroupName = "tpr.client-go.k8s.io" const GroupName = "tpr.client-go.k8s.io"
// SchemeGroupVersion is group version used to register these objects // SchemeGroupVersion is the group version used to register these objects.
var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"} var SchemeGroupVersion = schema.GroupVersion{Group: GroupName, Version: "v1"}
// Resource takes an unqualified resource and returns a Group qualified GroupResource // Resource takes an unqualified resource and returns a Group-qualified GroupResource.
func Resource(resource string) schema.GroupResource { func Resource(resource string) schema.GroupResource {
return SchemeGroupVersion.WithResource(resource).GroupResource() return SchemeGroupVersion.WithResource(resource).GroupResource()
} }
func init() { // addKnownTypes adds the set of types defined in this package to the supplied scheme.
// We only register manually written functions here. The registration of the
// generated functions takes place in the generated files. The separation
// makes the code compile even when the generated files are missing.
SchemeBuilder.Register(addKnownTypes)
}
// Adds the list of known types to api.Scheme.
func addKnownTypes(scheme *runtime.Scheme) error { func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion, scheme.AddKnownTypes(SchemeGroupVersion,
&Example{}, &Example{},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment