dev: unify keeper and CHI scheme building approach

pkg/apis/clickhouse.altinity.com/v1/register.go

@@ -27,39 +27,41 @@ const (
 	APIVersion = "v1"
 )
 
-// SchemeGroupVersion is group version used to register these objects
-var SchemeGroupVersion = schema.GroupVersion{
+// GroupVersion is group version used to register these objects
+var GroupVersion = schema.GroupVersion{
 	Group:   clickhousealtinitycom.APIGroupName,
 	Version: APIVersion,
 }
 
 // Resource returns schema.GroupResource
 func Resource(resource string) schema.GroupResource {
-	return SchemeGroupVersion.WithResource(resource).GroupResource()
+	return GroupVersion.WithResource(resource).GroupResource()
 }
 
 var (
-	// SchemeBuilder collects scheme builder functions
-	SchemeBuilder runtime.SchemeBuilder
+	// localSchemeBuilder is an instance of SchemeBuilder
+	localSchemeBuilder = new(runtime.SchemeBuilder)
+
 	// AddToScheme applies SchemeBuilder functions to the specified scheme
-	AddToScheme        = localSchemeBuilder.AddToScheme
-	localSchemeBuilder = &SchemeBuilder
+	// This function is called from the generated client code
+	AddToScheme = localSchemeBuilder.AddToScheme
 )
 
 func init() {
 	localSchemeBuilder.Register(addKnownTypes)
 }
 
-// Adds a list of known types to the api.Scheme object
+// addKnownTypes adds list of known types to the api.Scheme object
 func addKnownTypes(scheme *runtime.Scheme) error {
-	scheme.AddKnownTypes(SchemeGroupVersion,
+	scheme.AddKnownTypes(
+		GroupVersion,
 		&ClickHouseInstallation{},
 		&ClickHouseInstallationList{},
 		&ClickHouseInstallationTemplate{},
 		&ClickHouseInstallationTemplateList{},
 		&ClickHouseOperatorConfiguration{},
 		&ClickHouseOperatorConfigurationList{},
 	)
-	metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
+	metav1.AddToGroupVersion(scheme, GroupVersion)
 	return nil
 }

pkg/apis/clickhouse.com/v1alpha1/groupversion_info.go → pkg/apis/clickhouse.com/v1alpha1/register.go

@@ -7,11 +7,23 @@ import (
 
 var (
 	// GroupVersion is group version used to register these objects
-	GroupVersion = schema.GroupVersion{Group: "clickhouse.com", Version: "v1alpha1"}
+	GroupVersion = schema.GroupVersion{
+		Group:   "clickhouse.com",
+		Version: "v1alpha1",
+	}
 
 	// SchemeBuilder is used to add go types to the GroupVersionKind scheme
-	SchemeBuilder = &scheme.Builder{GroupVersion: GroupVersion}
+	SchemeBuilder = &scheme.Builder{
+		GroupVersion: GroupVersion,
+	}
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
 )
+
+func init() {
+	SchemeBuilder.Register(
+		&ClickHouseKeeper{},
+		&ClickHouseKeeperList{},
+	)
+}

pkg/apis/clickhouse.com/v1alpha1/types.go

@@ -8,10 +8,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-func init() {
-	SchemeBuilder.Register(&ClickHouseKeeper{}, &ClickHouseKeeperList{})
-}
-
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
 // ClickHouseKeeper defines a ClickHouse Keeper Cluster