@@ -35,6 +35,7 @@ import (
35
35
corev1 "k8s.io/api/core/v1"
36
36
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
37
37
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
38
+ "k8s.io/apimachinery/pkg/conversion"
38
39
"k8s.io/apimachinery/pkg/runtime"
39
40
kerrors "k8s.io/apimachinery/pkg/util/errors"
40
41
"k8s.io/klog/v2"
@@ -946,15 +947,12 @@ func modifyMachineDeployments(baseClusterTemplateYAML []byte, count int64) []byt
946
947
scheme := runtime .NewScheme ()
947
948
framework .TryAddDefaultSchemes (scheme )
948
949
cluster := & clusterv1.Cluster {}
949
- if objs [0 ].GetAPIVersion () == clusterv1beta1 .GroupVersion .String () {
950
- // Read a v1beta1 Cluster and convert to a v1beta2 Cluster.
951
- _ = clusterv1beta1 .AddToScheme (scheme )
952
- clusterV1beta1 := & clusterv1beta1.Cluster {}
953
- Expect (scheme .Convert (& objs [0 ], clusterV1beta1 , nil )).Should (Succeed ())
954
- Expect (clusterv1beta1 .Convert_v1beta1_Cluster_To_v1beta2_Cluster (clusterV1beta1 , cluster , nil )).To (Succeed ())
955
- } else {
956
- Expect (scheme .Convert (& objs [0 ], cluster , nil )).Should (Succeed ())
957
- }
950
+ // Adding v1beta1 scheme and registering the conversion function to allow auto-converting to v1beta2.
951
+ _ = clusterv1beta1 .AddToScheme (scheme )
952
+ Expect (scheme .AddConversionFunc ((* clusterv1beta1 .Cluster )(nil ), (* clusterv1 .Cluster )(nil ), func (a , b interface {}, scope conversion.Scope ) error {
953
+ return clusterv1beta1 .Convert_v1beta1_Cluster_To_v1beta2_Cluster (a .(* clusterv1beta1.Cluster ), b .(* clusterv1.Cluster ), nil )
954
+ })).To (Succeed ())
955
+ Expect (scheme .Convert (& objs [0 ], cluster , nil )).Should (Succeed ())
958
956
959
957
// Verify the Cluster Topology.
960
958
Expect (cluster .Spec .Topology ).NotTo (BeNil (), "Should be a ClusterClass based Cluster" )
0 commit comments