[WIP][POC] ✨ Remove CR dependency in API packages

Makefile

@@ -23,8 +23,8 @@ SHELL:=/usr/bin/env bash
 #
 # Go.
 #
-GO_VERSION ?= 1.24.7
-GO_DIRECTIVE_VERSION ?= 1.24.0
+GO_VERSION ?= 1.25.3
+GO_DIRECTIVE_VERSION ?= 1.23.0
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 
 # Ensure correct toolchain is used

Tiltfile

@@ -172,7 +172,7 @@ def load_provider_tilt_files():
 
 tilt_helper_dockerfile_header = """
 # Tilt image
-FROM golang:1.24.7 as tilt-helper
+FROM golang:1.25.3 as tilt-helper
 # Install delve. Note this should be kept in step with the Go release minor version.
 RUN go install github.com/go-delve/delve/cmd/[email protected]
 # Support live reloading with Tilt
@@ -183,7 +183,7 @@ RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com
 """
 
 tilt_dockerfile_header = """
-FROM golang:1.24.7 as tilt
+FROM golang:1.25.3 as tilt
 WORKDIR /
 COPY --from=tilt-helper /process.txt .
 COPY --from=tilt-helper /start.sh .

api/core/v1beta1/conversion.go

@@ -44,94 +44,6 @@ func SetAPIVersionGetter(f func(gk schema.GroupKind) (string, error)) {
 	apiVersionGetter = f
 }
 
-func (src *Cluster) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*clusterv1.Cluster)
-
-	if err := Convert_v1beta1_Cluster_To_v1beta2_Cluster(src, dst, nil); err != nil {
-		return err
-	}
-
-	if src.Spec.InfrastructureRef != nil {
-		infraRef, err := convertToContractVersionedObjectReference(src.Spec.InfrastructureRef)
-		if err != nil {
-			return err
-		}
-		dst.Spec.InfrastructureRef = infraRef
-	}
-
-	if src.Spec.ControlPlaneRef != nil {
-		controlPlaneRef, err := convertToContractVersionedObjectReference(src.Spec.ControlPlaneRef)
-		if err != nil {
-			return err
-		}
-		dst.Spec.ControlPlaneRef = controlPlaneRef
-	}
-
-	restored := &clusterv1.Cluster{}
-	ok, err := utilconversion.UnmarshalData(src, restored)
-	if err != nil {
-		return err
-	}
-
-	// Recover intent for bool values converted to *bool.
-	clusterv1.Convert_bool_To_Pointer_bool(src.Spec.Paused, ok, restored.Spec.Paused, &dst.Spec.Paused)
-
-	initialization := clusterv1.ClusterInitializationStatus{}
-	restoredControlPlaneInitialized := restored.Status.Initialization.ControlPlaneInitialized
-	restoredInfrastructureProvisioned := restored.Status.Initialization.InfrastructureProvisioned
-	clusterv1.Convert_bool_To_Pointer_bool(src.Status.ControlPlaneReady, ok, restoredControlPlaneInitialized, &initialization.ControlPlaneInitialized)
-	clusterv1.Convert_bool_To_Pointer_bool(src.Status.InfrastructureReady, ok, restoredInfrastructureProvisioned, &initialization.InfrastructureProvisioned)
-	if !reflect.DeepEqual(initialization, clusterv1.ClusterInitializationStatus{}) {
-		dst.Status.Initialization = initialization
-	}
-	return nil
-}
-
-func (dst *Cluster) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*clusterv1.Cluster)
-	if err := Convert_v1beta2_Cluster_To_v1beta1_Cluster(src, dst, nil); err != nil {
-		return err
-	}
-
-	if src.Spec.InfrastructureRef.IsDefined() {
-		infraRef, err := convertToObjectReference(src.Spec.InfrastructureRef, src.Namespace)
-		if err != nil {
-			return err
-		}
-		dst.Spec.InfrastructureRef = infraRef
-	}
-
-	if src.Spec.ControlPlaneRef.IsDefined() {
-		controlPlaneRef, err := convertToObjectReference(src.Spec.ControlPlaneRef, src.Namespace)
-		if err != nil {
-			return err
-		}
-		dst.Spec.ControlPlaneRef = controlPlaneRef
-	}
-
-	if dst.Spec.ClusterNetwork != nil && dst.Spec.ClusterNetwork.APIServerPort != nil &&
-		*dst.Spec.ClusterNetwork.APIServerPort == 0 {
-		dst.Spec.ClusterNetwork.APIServerPort = nil
-	}
-
-	if dst.Spec.Topology != nil {
-		if dst.Spec.Topology.ControlPlane.MachineHealthCheck != nil && dst.Spec.Topology.ControlPlane.MachineHealthCheck.RemediationTemplate != nil {
-			dst.Spec.Topology.ControlPlane.MachineHealthCheck.RemediationTemplate.Namespace = dst.Namespace
-		}
-		if dst.Spec.Topology.Workers != nil {
-			for _, md := range dst.Spec.Topology.Workers.MachineDeployments {
-				if md.MachineHealthCheck != nil && md.MachineHealthCheck.RemediationTemplate != nil {
-					md.MachineHealthCheck.RemediationTemplate.Namespace = dst.Namespace
-				}
-			}
-		}
-	}
-
-	dropEmptyStringsCluster(dst)
-
-	return utilconversion.MarshalData(src, dst)
-}
-
 func (src *ClusterClass) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*clusterv1.ClusterClass)
 

api/core/v1beta1/conversion_test.go

@@ -55,6 +55,7 @@ func TestFuzzyConversion(t *testing.T) {
 		return "", fmt.Errorf("failed to map GroupKind %s to version", gk.String())
 	})
 
+	// FIXME: implement a new test util for the new conversion.
 	t.Run("for Cluster", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Hub:         &clusterv1.Cluster{},
 		Spoke:       &Cluster{},

api/core/v1beta2/conversion.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/utils/ptr"
 )
 
-func (*Cluster) Hub()            {}
 func (*ClusterClass) Hub()       {}
 func (*Machine) Hub()            {}
 func (*MachineSet) Hub()         {}

api/runtime/v1alpha1/conversion.go

@@ -22,35 +22,11 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/utils/ptr"
-	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 	runtimev1 "sigs.k8s.io/cluster-api/api/runtime/v1beta2"
 )
 
-func (src *ExtensionConfig) ConvertTo(dstRaw conversion.Hub) error {
-	dst := dstRaw.(*runtimev1.ExtensionConfig)
-
-	return Convert_v1alpha1_ExtensionConfig_To_v1beta2_ExtensionConfig(src, dst, nil)
-}
-
-func (dst *ExtensionConfig) ConvertFrom(srcRaw conversion.Hub) error {
-	src := srcRaw.(*runtimev1.ExtensionConfig)
-
-	if err := Convert_v1beta2_ExtensionConfig_To_v1alpha1_ExtensionConfig(src, dst, nil); err != nil {
-		return err
-	}
-
-	dropEmptyStringsExtensionConfig(dst)
-	for i, h := range dst.Status.Handlers {
-		if h.TimeoutSeconds != nil && *h.TimeoutSeconds == 0 {
-			h.TimeoutSeconds = nil
-		}
-		dst.Status.Handlers[i] = h
-	}
-	return nil
-}
-
 func Convert_v1beta2_ExtensionConfigStatus_To_v1alpha1_ExtensionConfigStatus(in *runtimev1.ExtensionConfigStatus, out *ExtensionConfigStatus, s apimachineryconversion.Scope) error {
 	if err := autoConvert_v1beta2_ExtensionConfigStatus_To_v1alpha1_ExtensionConfigStatus(in, out, s); err != nil {
 		return err

exp/topology/desiredstate/desired_state.go

@@ -565,7 +565,7 @@ func (g *generator) computeControlPlaneVersion(ctx context.Context, s *scope.Sco
 		if hooks.IsPending(runtimehooksv1.AfterControlPlaneUpgrade, s.Current.Cluster) {
 			v1beta1Cluster := &clusterv1beta1.Cluster{}
 			// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
-			if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster.DeepCopy()); err != nil {
+			if err := webhooks.ConvertClusterHubToV1Beta1(ctx, s.Current.Cluster.DeepCopy(), v1beta1Cluster); err != nil {
 				return "", errors.Wrap(err, "error converting Cluster to v1beta1 Cluster")
 			}
 
@@ -668,7 +668,7 @@ func (g *generator) computeControlPlaneVersion(ctx context.Context, s *scope.Sco
 			// up the topologyVersion. Call the BeforeClusterUpgrade hook before picking up the desired version.
 			v1beta1Cluster := &clusterv1beta1.Cluster{}
 			// DeepCopy cluster because ConvertFrom has side effects like adding the conversion annotation.
-			if err := v1beta1Cluster.ConvertFrom(s.Current.Cluster.DeepCopy()); err != nil {
+			if err := webhooks.ConvertClusterHubToV1Beta1(ctx, s.Current.Cluster.DeepCopy(), v1beta1Cluster); err != nil {
 				return "", errors.Wrap(err, "error converting Cluster to v1beta1 Cluster")
 			}
 

go.mod

@@ -1,6 +1,8 @@
 module sigs.k8s.io/cluster-api
 
-go 1.24.0
+go 1.25.0
+
+replace sigs.k8s.io/controller-runtime => ../controller-runtime
 
 require (
 	github.com/MakeNowJust/heredoc v1.0.0
@@ -25,7 +27,7 @@ require (
 	github.com/onsi/ginkgo/v2 v2.25.3
 	github.com/onsi/gomega v1.38.2
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.22.0
+	github.com/prometheus/client_golang v1.23.2
 	github.com/spf13/cobra v1.10.1
 	github.com/spf13/pflag v1.0.10
 	github.com/spf13/viper v1.21.0
@@ -39,15 +41,15 @@ require (
 	golang.org/x/text v0.29.0
 	gomodules.xyz/jsonpatch/v2 v2.5.0
 	google.golang.org/grpc v1.72.3
-	k8s.io/api v0.34.1
-	k8s.io/apiextensions-apiserver v0.34.1
-	k8s.io/apimachinery v0.34.1
-	k8s.io/apiserver v0.34.1
-	k8s.io/client-go v0.34.1
+	k8s.io/api v0.35.0-alpha.1
+	k8s.io/apiextensions-apiserver v0.35.0-alpha.1
+	k8s.io/apimachinery v0.35.0-alpha.1
+	k8s.io/apiserver v0.35.0-alpha.1
+	k8s.io/client-go v0.35.0-alpha.1
 	k8s.io/cluster-bootstrap v0.34.1
-	k8s.io/component-base v0.34.1
+	k8s.io/component-base v0.35.0-alpha.1
 	k8s.io/klog/v2 v2.130.1
-	k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
+	k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
 	sigs.k8s.io/controller-runtime v0.22.1
 	sigs.k8s.io/randfill v1.0.0
@@ -112,9 +114,9 @@ require (
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_model v0.6.1 // indirect
-	github.com/prometheus/common v0.62.0 // indirect
-	github.com/prometheus/procfs v0.15.1 // indirect
+	github.com/prometheus/client_model v0.6.2 // indirect
+	github.com/prometheus/common v0.66.1 // indirect
+	github.com/prometheus/procfs v0.16.1 // indirect
 	github.com/rivo/uniseg v0.4.2 // indirect
 	github.com/sagikazarmark/locafero v0.11.0 // indirect
 	github.com/shopspring/decimal v1.4.0 // indirect
@@ -126,13 +128,13 @@ require (
 	github.com/vincent-petithory/dataurl v1.0.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
 	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
-	go.opentelemetry.io/otel v1.35.0 // indirect
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.61.0 // indirect
+	go.opentelemetry.io/otel v1.36.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0 // indirect
-	go.opentelemetry.io/otel/metric v1.35.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.34.0 // indirect
-	go.opentelemetry.io/otel/trace v1.35.0 // indirect
+	go.opentelemetry.io/otel/metric v1.36.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
+	go.opentelemetry.io/otel/trace v1.36.0 // indirect
 	go.opentelemetry.io/proto/otlp v1.5.0 // indirect
 	go.uber.org/automaxprocs v1.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
@@ -147,12 +149,12 @@ require (
 	golang.org/x/time v0.9.0 // indirect
 	golang.org/x/tools v0.36.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20250303144028-a0af3efb3deb // indirect
-	google.golang.org/protobuf v1.36.7 // indirect
-	gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a // indirect
+	google.golang.org/protobuf v1.36.8 // indirect
+	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
-	sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
+	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
 )