Use register-gen to generate schema registration boilerplate

Signed-off-by: Tom Wieczorek <[email protected]>

Makefile

@@ -115,8 +115,11 @@ go.sum: go.mod .k0sbuild.docker-image.k0s
 # List of all the custom APIs that k0s defines.
 api_group_versions := $(foreach path,$(wildcard pkg/apis/*/v*/doc.go),$(path:pkg/apis/%/doc.go=%))
 
+# Declare the requisites for the generators operating on API group versions.
+api_group_version_generator_files := .controller-gen.stamp zz_generated.register.go
+$(foreach gv,$(api_group_versions),$(eval $(foreach f,$(api_group_version_generator_files),pkg/apis/$(gv)/$(f)): $$(shell find pkg/apis/$(gv)/ -maxdepth 1 -type f -name '*.go' -not -name '*_test.go' -not -name 'zz_generated*')))
+
 # Run controller-gen for all API group versions.
-$(foreach gv,$(api_group_versions),$(eval pkg/apis/$(gv)/.controller-gen.stamp: $$(shell find pkg/apis/$(gv)/ -maxdepth 1 -type f -name '*.go' -not -name '*_test.go' -not -name 'zz_generated*')))
 $(foreach gv,$(api_group_versions),pkg/apis/$(gv)/.controller-gen.stamp): .k0sbuild.docker-image.k0s hack/tools/boilerplate.go.txt hack/tools/Makefile.variables
 	rm -rf 'static/manifests/$(dir $(@:pkg/apis/%/.controller-gen.stamp=%))CustomResourceDefinition'
 	mkdir -p 'static/manifests/$(dir $(@:pkg/apis/%/.controller-gen.stamp=%))'
@@ -130,6 +133,14 @@ $(foreach gv,$(api_group_versions),pkg/apis/$(gv)/.controller-gen.stamp): .k0sbu
 	touch -- '$@'
 codegen_targets := $(foreach gv,$(api_group_versions),pkg/apis/$(gv)/.controller-gen.stamp)
 
+# Run register-gen for all API group versions.
+$(foreach gv,$(api_group_versions),pkg/apis/$(gv)/zz_generated.register.go): .k0sbuild.docker-image.k0s hack/tools/boilerplate.go.txt hack/tools/Makefile.variables
+	CGO_ENABLED=0 $(GO) run k8s.io/code-generator/cmd/register-gen@v$(kubernetes_version:1.%=0.%) \
+	  --go-header-file=hack/tools/boilerplate.go.txt \
+	  --output-file='$(notdir $@)' \
+	  'github.com/k0sproject/k0s/$(dir $@)'
+codegen_targets := $(foreach gv,$(api_group_versions),pkg/apis/$(gv)/zz_generated.register.go)
+
 # Generate the k0s client-go clientset based on all custom API group versions.
 clientset_input_dirs := $(foreach gv,$(api_group_versions),pkg/apis/$(gv))
 codegen_targets += pkg/client/clientset/.client-gen.stamp

inttest/addons/addons_test.go

@@ -30,6 +30,7 @@ import (
 	"github.com/k0sproject/k0s/pkg/apis/helm/v1beta1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
 	k8s "k8s.io/client-go/kubernetes"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -124,8 +125,8 @@ func (as *AddonsSuite) deleteRelease(chart *v1beta1.Chart) {
 		return true, nil
 	}))
 
-	helmScheme, err := v1beta1.SchemeBuilder.Build()
-	as.Require().NoError(err)
+	helmScheme := runtime.NewScheme()
+	as.Require().NoError(v1beta1.Install(helmScheme))
 	chartClient, err := client.New(cfg, client.Options{Scheme: helmScheme})
 	as.Require().NoError(err)
 
@@ -179,8 +180,8 @@ func (as *AddonsSuite) deleteUninstalledChart(ctx context.Context) {
 	cfg, err := as.GetKubeConfig(as.ControllerNode(0))
 	as.Require().NoError(err)
 
-	scheme, err := v1beta1.SchemeBuilder.Build()
-	as.Require().NoError(err)
+	scheme := runtime.NewScheme()
+	as.Require().NoError(v1beta1.Install(scheme))
 	crClient, err := client.New(cfg, client.Options{Scheme: scheme})
 	as.Require().NoError(err)
 
@@ -243,8 +244,8 @@ func (as *AddonsSuite) waitForTestRelease(addonName, appVersion string, namespac
 	cfg, err := as.GetKubeConfig(as.ControllerNode(0))
 	as.Require().NoError(err)
 
-	helmScheme, err := v1beta1.SchemeBuilder.Build()
-	as.Require().NoError(err)
+	helmScheme := runtime.NewScheme()
+	as.Require().NoError(v1beta1.Install(helmScheme))
 	chartClient, err := client.New(cfg, client.Options{Scheme: helmScheme})
 	as.Require().NoError(err)
 	var chart v1beta1.Chart

pkg/apis/autopilot/v1beta2/types.go

@@ -19,15 +19,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func init() {
-	SchemeBuilder.Register(
-		&ControlNode{},
-		&ControlNodeList{},
-		&Plan{},
-		&PlanList{},
-	)
-}
-
 // ControlNode is a node which behaves as a controller, able to receive autopilot
 // signaling updates.
 //

pkg/apis/autopilot/v1beta2/updateconfig.go

@@ -23,13 +23,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func init() {
-	SchemeBuilder.Register(
-		&UpdateConfig{},
-		&UpdateConfigList{},
-	)
-}
-
 const UpdateConfigFinalizer = "updateconfig.autopilot.k0sproject.io"
 
 const (

pkg/apis/etcd/v1beta1/types.go

@@ -19,28 +19,9 @@ package v1beta1
 import (
 	"time"
 
-	"github.com/k0sproject/k0s/pkg/apis/etcd"
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"sigs.k8s.io/controller-runtime/pkg/scheme"
-
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-var (
-	// GroupVersion is group version used to register these objects
-	SchemeGroupVersion = schema.GroupVersion{Group: etcd.GroupName, Version: Version}
-
-	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: SchemeGroupVersion}
-
-	// AddToScheme adds the types in this group-version to the given scheme.
-	AddToScheme = SchemeBuilder.AddToScheme
-)
-
-func init() {
-	SchemeBuilder.Register(&EtcdMember{}, &EtcdMemberList{})
-}
-
 // EtcdMember describes the nodes etcd membership status
 //
 // +kubebuilder:object:root=true