Skip to content

Commit 42ca147

Browse files
sbueringersbueringer
committed
Remove CR dependency in API packages
1 parent 8f2d1a2 commit 42ca147

File tree

20 files changed

+607
-477
lines changed

20 files changed

+607
-477
lines changed

‎api/core/v1beta1/conversion.go‎

Lines changed: 0 additions & 88 deletions
Original file line numberDiff line numberDiff line change
@@ -44,94 +44,6 @@ func SetAPIVersionGetter(f func(gk schema.GroupKind) (string, error)) {
4444
apiVersionGetter = f
4545
}
4646

47-
func (src *Cluster) ConvertTo(dstRaw conversion.Hub) error {
48-
dst := dstRaw.(*clusterv1.Cluster)
49-
50-
if err := Convert_v1beta1_Cluster_To_v1beta2_Cluster(src, dst, nil); err != nil {
51-
return err
52-
}
53-
54-
if src.Spec.InfrastructureRef != nil {
55-
infraRef, err := convertToContractVersionedObjectReference(src.Spec.InfrastructureRef)
56-
if err != nil {
57-
return err
58-
}
59-
dst.Spec.InfrastructureRef = infraRef
60-
}
61-
62-
if src.Spec.ControlPlaneRef != nil {
63-
controlPlaneRef, err := convertToContractVersionedObjectReference(src.Spec.ControlPlaneRef)
64-
if err != nil {
65-
return err
66-
}
67-
dst.Spec.ControlPlaneRef = controlPlaneRef
68-
}
69-
70-
restored := &clusterv1.Cluster{}
71-
ok, err := utilconversion.UnmarshalData(src, restored)
72-
if err != nil {
73-
return err
74-
}
75-
76-
// Recover intent for bool values converted to *bool.
77-
clusterv1.Convert_bool_To_Pointer_bool(src.Spec.Paused, ok, restored.Spec.Paused, &dst.Spec.Paused)
78-
79-
initialization := clusterv1.ClusterInitializationStatus{}
80-
restoredControlPlaneInitialized := restored.Status.Initialization.ControlPlaneInitialized
81-
restoredInfrastructureProvisioned := restored.Status.Initialization.InfrastructureProvisioned
82-
clusterv1.Convert_bool_To_Pointer_bool(src.Status.ControlPlaneReady, ok, restoredControlPlaneInitialized, &initialization.ControlPlaneInitialized)
83-
clusterv1.Convert_bool_To_Pointer_bool(src.Status.InfrastructureReady, ok, restoredInfrastructureProvisioned, &initialization.InfrastructureProvisioned)
84-
if !reflect.DeepEqual(initialization, clusterv1.ClusterInitializationStatus{}) {
85-
dst.Status.Initialization = initialization
86-
}
87-
return nil
88-
}
89-
90-
func (dst *Cluster) ConvertFrom(srcRaw conversion.Hub) error {
91-
src := srcRaw.(*clusterv1.Cluster)
92-
if err := Convert_v1beta2_Cluster_To_v1beta1_Cluster(src, dst, nil); err != nil {
93-
return err
94-
}
95-
96-
if src.Spec.InfrastructureRef.IsDefined() {
97-
infraRef, err := convertToObjectReference(src.Spec.InfrastructureRef, src.Namespace)
98-
if err != nil {
99-
return err
100-
}
101-
dst.Spec.InfrastructureRef = infraRef
102-
}
103-
104-
if src.Spec.ControlPlaneRef.IsDefined() {
105-
controlPlaneRef, err := convertToObjectReference(src.Spec.ControlPlaneRef, src.Namespace)
106-
if err != nil {
107-
return err
108-
}
109-
dst.Spec.ControlPlaneRef = controlPlaneRef
110-
}
111-
112-
if dst.Spec.ClusterNetwork != nil && dst.Spec.ClusterNetwork.APIServerPort != nil &&
113-
*dst.Spec.ClusterNetwork.APIServerPort == 0 {
114-
dst.Spec.ClusterNetwork.APIServerPort = nil
115-
}
116-
117-
if dst.Spec.Topology != nil {
118-
if dst.Spec.Topology.ControlPlane.MachineHealthCheck != nil && dst.Spec.Topology.ControlPlane.MachineHealthCheck.RemediationTemplate != nil {
119-
dst.Spec.Topology.ControlPlane.MachineHealthCheck.RemediationTemplate.Namespace = dst.Namespace
120-
}
121-
if dst.Spec.Topology.Workers != nil {
122-
for _, md := range dst.Spec.Topology.Workers.MachineDeployments {
123-
if md.MachineHealthCheck != nil && md.MachineHealthCheck.RemediationTemplate != nil {
124-
md.MachineHealthCheck.RemediationTemplate.Namespace = dst.Namespace
125-
}
126-
}
127-
}
128-
}
129-
130-
dropEmptyStringsCluster(dst)
131-
132-
return utilconversion.MarshalData(src, dst)
133-
}
134-
13547
func (src *ClusterClass) ConvertTo(dstRaw conversion.Hub) error {
13648
dst := dstRaw.(*clusterv1.ClusterClass)
13749

‎api/core/v1beta1/conversion_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ func TestFuzzyConversion(t *testing.T) {
5555
return "", fmt.Errorf("failed to map GroupKind %s to version", gk.String())
5656
})
5757

58+
// FIXME: implement a new test util for the new conversion.
5859
t.Run("for Cluster", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
5960
Hub: &clusterv1.Cluster{},
6061
Spoke: &Cluster{},

‎api/core/v1beta2/conversion.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import (
2424
"k8s.io/utils/ptr"
2525
)
2626

27-
func (*Cluster) Hub() {}
2827
func (*ClusterClass) Hub() {}
2928
func (*Machine) Hub() {}
3029
func (*MachineSet) Hub() {}

‎api/runtime/v1alpha1/.import-restrictions‎

Lines changed: 0 additions & 5 deletions
This file was deleted.

‎api/runtime/v1alpha1/conversion.go‎

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -22,35 +22,11 @@ import (
2222
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2323
apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
2424
"k8s.io/utils/ptr"
25-
"sigs.k8s.io/controller-runtime/pkg/conversion"
2625

2726
clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
2827
runtimev1 "sigs.k8s.io/cluster-api/api/runtime/v1beta2"
2928
)
3029

31-
func (src *ExtensionConfig) ConvertTo(dstRaw conversion.Hub) error {
32-
dst := dstRaw.(*runtimev1.ExtensionConfig)
33-
34-
return Convert_v1alpha1_ExtensionConfig_To_v1beta2_ExtensionConfig(src, dst, nil)
35-
}
36-
37-
func (dst *ExtensionConfig) ConvertFrom(srcRaw conversion.Hub) error {
38-
src := srcRaw.(*runtimev1.ExtensionConfig)
39-
40-
if err := Convert_v1beta2_ExtensionConfig_To_v1alpha1_ExtensionConfig(src, dst, nil); err != nil {
41-
return err
42-
}
43-
44-
dropEmptyStringsExtensionConfig(dst)
45-
for i, h := range dst.Status.Handlers {
46-
if h.TimeoutSeconds != nil && *h.TimeoutSeconds == 0 {
47-
h.TimeoutSeconds = nil
48-
}
49-
dst.Status.Handlers[i] = h
50-
}
51-
return nil
52-
}
53-
5430
func Convert_v1beta2_ExtensionConfigStatus_To_v1alpha1_ExtensionConfigStatus(in *runtimev1.ExtensionConfigStatus, out *ExtensionConfigStatus, s apimachineryconversion.Scope) error {
5531
if err := autoConvert_v1beta2_ExtensionConfigStatus_To_v1alpha1_ExtensionConfigStatus(in, out, s); err != nil {
5632
return err

‎api/runtime/v1beta2/conversion.go‎

Lines changed: 0 additions & 19 deletions
This file was deleted.

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ module sigs.k8s.io/cluster-api
22

33
go 1.24.0
44

5+
replace sigs.k8s.io/controller-runtime => ../controller-runtime
6+
57
require (
68
github.com/MakeNowJust/heredoc v1.0.0
79
github.com/Masterminds/sprig/v3 v3.3.0

‎go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -606,8 +606,6 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
606606
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
607607
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
608608
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
609-
sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV24Eqg=
610-
sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
611609
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
612610
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
613611
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=

‎hack/tools/go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ replace sigs.k8s.io/cluster-api => ../../
66

77
replace sigs.k8s.io/cluster-api/test => ../../test
88

9+
replace sigs.k8s.io/controller-runtime => ../../../controller-runtime
10+
911
require (
1012
cloud.google.com/go/storage v1.57.0
1113
github.com/blang/semver/v4 v4.0.0

‎hack/tools/go.sum‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -544,8 +544,6 @@ k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 h1:hwvWFiBzdWw1FhfY1FooPn3kzWuJ8
544544
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
545545
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 h1:jpcvIRr3GLoUoEKRkHKSmGjxb6lWwrBlJsXc+eUYQHM=
546546
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2/go.mod h1:Ve9uj1L+deCXFrPOk1LpFXqTg7LCFzFso6PA48q/XZw=
547-
sigs.k8s.io/controller-runtime v0.22.1 h1:Ah1T7I+0A7ize291nJZdS1CabF/lB4E++WizgV24Eqg=
548-
sigs.k8s.io/controller-runtime v0.22.1/go.mod h1:FwiwRjkRPbiN+zp2QRp7wlTCzbUXxZ/D4OzuQUDwBHY=
549547
sigs.k8s.io/controller-tools v0.19.0 h1:OU7jrPPiZusryu6YK0jYSjPqg8Vhf8cAzluP9XGI5uk=
550548
sigs.k8s.io/controller-tools v0.19.0/go.mod h1:y5HY/iNDFkmFla2CfQoVb2AQXMsBk4ad84iR1PLANB0=
551549
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

0 commit comments

Comments
 (0)