Skip to content

Commit 38c997b

Browse files
committed
e2e: use scheme converter in scale test
1 parent a105831 commit 38c997b

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

test/e2e/scale.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import (
3535
corev1 "k8s.io/api/core/v1"
3636
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3737
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
38+
"k8s.io/apimachinery/pkg/conversion"
3839
"k8s.io/apimachinery/pkg/runtime"
3940
kerrors "k8s.io/apimachinery/pkg/util/errors"
4041
"k8s.io/klog/v2"
@@ -946,15 +947,12 @@ func modifyMachineDeployments(baseClusterTemplateYAML []byte, count int64) []byt
946947
scheme := runtime.NewScheme()
947948
framework.TryAddDefaultSchemes(scheme)
948949
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())
958956

959957
// Verify the Cluster Topology.
960958
Expect(cluster.Spec.Topology).NotTo(BeNil(), "Should be a ClusterClass based Cluster")

0 commit comments

Comments
 (0)