[WIP] feat: new v1beta1 api version for control plane

Makefile

@@ -75,7 +75,7 @@ CONTROLLER_GEN_BIN := controller-gen
 CONTROLLER_GEN := $(abspath $(TOOLS_BIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER))
 CONTROLLER_GEN_PKG := sigs.k8s.io/controller-tools/cmd/controller-gen
 
-CONVERSION_GEN_VER := v0.25.0
+CONVERSION_GEN_VER := v0.28.0
 CONVERSION_GEN_BIN := conversion-gen
 # We are intentionally using the binary without version suffix, to avoid the version
 # in generated files.
@@ -179,6 +179,25 @@ generate-manifests-rke2-control-plane: $(CONTROLLER_GEN) ## Generate manifests e
 		output:webhook:dir=./controlplane/config/webhook \
 		webhook
 
+.PHONY: generate-go-deepcopy
+generate-conversions:  ## Run all conversion funcs
+	$(MAKE) $(addprefix generate-conversions-,$(ALL_GENERATE_MODULES))
+
+.PHONY: generate-conversions-rke2-control-plane
+generate-conversions-rke2-control-plane: $(CONVERSION_GEN) ## Generate conversion functions for control plane provider
+	$(MAKE) clean-generated-conversions SRC_DIRS="./controlplane/api"
+	$(CONVERSION_GEN) \
+		--input-dirs=./controlplane/api/v1alpha1 \
+		--extra-peer-dirs=github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1 \
+		--extra-peer-dirs=sigs.k8s.io/cluster-api/api/v1beta1 \
+		--build-tag=ignore_autogenerated_conversions \
+		--output-file-base=zz_generated.conversion $(CONVERSION_GEN_OUTPUT_BASE_CAPRKE2) \
+		--go-header-file=./hack/boilerplate.go.txt
+
+.PHONY: generate-conversions-rke2-bootstrap
+generate-conversions-rke2-bootstrap: $(CONVERSION_GEN) ## Generate conversion functions for bootstrap provider
+	echo "TODO"
+
 .PHONY: generate-go-deepcopy
 generate-go-deepcopy:  ## Run all generate-go-deepcopy-* targets
 	$(MAKE) $(addprefix generate-go-deepcopy-,$(ALL_GENERATE_MODULES))
@@ -556,6 +575,10 @@ clean-generated-yaml: ## Remove files generated by conversion-gen from the menti
 clean-generated-deepcopy: ## Remove files generated by conversion-gen from the mentioned dirs. Example SRC_DIRS="./api/v1alpha4"
 	(IFS=','; for i in $(SRC_DIRS); do find $$i -type f -name 'zz_generated.deepcopy*' -exec rm -f {} \;; done)
 
+.PHONY: clean-generated-conversions
+clean-generated-conversions: ## Remove files generated by conversion-gen from the mentioned dirs. Example SRC_DIRS="./api/v1alpha4"
+	(IFS=','; for i in $(SRC_DIRS); do find $$i -type f -name 'zz_generated.conversion*' -exec rm -f {} \;; done)
+
 ## --------------------------------------
 ## Hack / Tools
 ## --------------------------------------

bootstrap/internal/controllers/rke2config_controller.go

@@ -44,7 +44,7 @@ import (
 	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/cloudinit"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/ignition"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
+	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/locking"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/rke2"

bootstrap/main.go

@@ -41,7 +41,7 @@ import (
 
 	bootstrapv1 "github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/api/v1alpha1"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/bootstrap/internal/controllers"
-	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1alpha1"
+	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
 	"github.com/rancher-sandbox/cluster-api-provider-rke2/pkg/consts"
 )
 

controlplane/api/v1alpha1/conversion.go

@@ -0,0 +1,69 @@
+/*
+Copyright 2024 SUSE.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	controlplanev1 "github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	//utilconversion "sigs.k8s.io/cluster-api/util/conversion"
+	"sigs.k8s.io/controller-runtime/pkg/conversion"
+)
+
+// ConvertTo converts the v1alpha1 RKE2ControlPlane receiver to a v1beta1 RKEControlPlane.
+func (r *RKE2ControlPlane) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*controlplanev1.RKE2ControlPlane)
+
+	if err := autoConvert_v1alpha1_RKE2ControlPlane_To_v1beta1_RKE2ControlPlane(r, dst, nil); err != nil {
+		return err
+	}
+
+	// restored := &controlplanev1.RKE2ControlPlane{}
+	// if ok, err := utilconversion.UnmarshalData(r, restored); err != nil || !ok {
+	// 	return err
+	// }
+	//dst.Spec.XXX = restored.Spec.XXXX
+
+	return nil
+}
+
+// ConvertFrom converts the v1beta1 RKE2ControlPlane receiver to a v1alpha1 RKE2ControlPlane.
+func (r *RKE2ControlPlane) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*controlplanev1.RKE2ControlPlane)
+
+	if err := autoConvert_v1beta1_RKE2ControlPlane_To_v1alpha1_RKE2ControlPlane(src, r, nil); err != nil {
+		return err
+	}
+
+	// if err := utilconversion.MarshalData(src, r); err != nil {
+	// 	return nil
+	// }
+
+	return nil
+}
+
+// ConvertTo converts the v1alpha1 RKE2ControlPlaneList receiver to a v1beta1 RKEControlPlaneList.
+func (r *RKE2ControlPlaneList) ConvertTo(dstRaw conversion.Hub) error {
+	dst := dstRaw.(*controlplanev1.RKE2ControlPlaneList)
+
+	return autoConvert_v1alpha1_RKE2ControlPlaneList_To_v1beta1_RKE2ControlPlaneList(r, dst, nil)
+}
+
+// ConvertFrom converts the v1beta1 RKE2ControlPlaneList receiver to a v1alpha1 RKE2ControlPlaneList.
+func (r *RKE2ControlPlaneList) ConvertFrom(srcRaw conversion.Hub) error {
+	src := srcRaw.(*controlplanev1.RKE2ControlPlaneList)
+
+	return autoConvert_v1beta1_RKE2ControlPlaneList_To_v1alpha1_RKE2ControlPlaneList(src, r, nil)
+}

controlplane/api/v1alpha1/conversion_test.go

@@ -0,0 +1,42 @@
+/*
+Copyright 2024 SUSE.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1alpha1
+
+import (
+	"testing"
+
+	. "github.com/onsi/gomega"
+
+	"github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
+	"k8s.io/apimachinery/pkg/runtime"
+	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
+)
+
+func TestFuzzyConversion(t *testing.T) {
+	g := NewWithT(t)
+	scheme := runtime.NewScheme()
+	g.Expect(AddToScheme(scheme)).To(Succeed())
+	g.Expect(v1beta1.AddToScheme(scheme)).To(Succeed())
+
+	t.Run("for RKE2ControlPlane", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
+		Scheme:      scheme,
+		Hub:         &v1beta1.RKE2ControlPlane{},
+		Spoke:       &RKE2ControlPlane{},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{},
+	}))
+}

controlplane/api/v1alpha1/doc.go

@@ -0,0 +1,22 @@
+/*
+Copyright 2022 SUSE.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package v1alpha1 contains API Schema definitions for the controlplane v1alpha1 API group
+// +kubebuilder:object:generate=true
+// +groupName=controlplane.cluster.x-k8s.io
+// +k8s:defaulter-gen=TypeMeta
+// +k8s:conversion-gen=github.com/rancher-sandbox/cluster-api-provider-rke2/controlplane/api/v1beta1
+package v1alpha1

controlplane/api/v1alpha1/groupversion_info.go

@@ -14,9 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package v1alpha1 contains API Schema definitions for the controlplane v1alpha1 API group
-// +kubebuilder:object:generate=true
-// +groupName=controlplane.cluster.x-k8s.io
 package v1alpha1
 
 import (
@@ -33,4 +30,6 @@ var (
 
 	// AddToScheme adds the types in this group-version to the given scheme.
 	AddToScheme = SchemeBuilder.AddToScheme
+
+	localSchemeBuilder = SchemeBuilder.SchemeBuilder
 )