Skip to content

Commit 594cce7

Browse files
committed
Fix Test_* with no addonsv1 scheme
1 parent 32c6045 commit 594cce7

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

cmd/clusterctl/internal/test/fake_objects.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ func (f *FakeClusterResourceSet) Objs() []client.Object {
11231123
crs := &addonsv1.ClusterResourceSet{
11241124
TypeMeta: metav1.TypeMeta{
11251125
Kind: "ClusterResourceSet",
1126-
APIVersion: clusterv1.GroupVersion.String(),
1126+
APIVersion: addonsv1.GroupVersion.String(),
11271127
},
11281128
ObjectMeta: metav1.ObjectMeta{
11291129
Name: f.name,
@@ -1184,7 +1184,7 @@ func (f *FakeClusterResourceSet) Objs() []client.Object {
11841184
binding := &addonsv1.ClusterResourceSetBinding{
11851185
TypeMeta: metav1.TypeMeta{
11861186
Kind: "ClusterResourceSetBinding",
1187-
APIVersion: clusterv1.GroupVersion.String(),
1187+
APIVersion: addonsv1.GroupVersion.String(),
11881188
},
11891189
ObjectMeta: metav1.ObjectMeta{
11901190
Name: cluster.Name,
@@ -1461,8 +1461,8 @@ func FakeCRDList() []*apiextensionsv1.CustomResourceDefinition {
14611461
FakeNamespacedCustomResourceDefinition(clusterv1.GroupVersion.Group, "MachineDeployment", version),
14621462
FakeNamespacedCustomResourceDefinition(clusterv1.GroupVersion.Group, "MachineSet", version),
14631463
FakeNamespacedCustomResourceDefinition(expv1.GroupVersion.Group, "MachinePool", version),
1464-
FakeNamespacedCustomResourceDefinition(clusterv1.GroupVersion.Group, "ClusterResourceSet", version),
1465-
FakeNamespacedCustomResourceDefinition(clusterv1.GroupVersion.Group, "ClusterResourceSetBinding", version),
1464+
FakeNamespacedCustomResourceDefinition(addonsv1.GroupVersion.Group, "ClusterResourceSet", version),
1465+
FakeNamespacedCustomResourceDefinition(addonsv1.GroupVersion.Group, "ClusterResourceSetBinding", version),
14661466
FakeNamespacedCustomResourceDefinition(fakecontrolplane.GroupVersion.Group, "GenericControlPlane", version),
14671467
FakeNamespacedCustomResourceDefinition(fakecontrolplane.GroupVersion.Group, "GenericControlPlaneTemplate", version),
14681468
FakeNamespacedCustomResourceDefinition(fakeinfrastructure.GroupVersion.Group, "GenericInfrastructureCluster", version),

cmd/clusterctl/internal/test/fake_proxy.go

+3
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ import (
2020
"context"
2121
"errors"
2222

23+
addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta1"
24+
2325
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2426
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2527
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -55,6 +57,7 @@ func init() {
5557
_ = clientgoscheme.AddToScheme(FakeScheme)
5658
_ = clusterctlv1.AddToScheme(FakeScheme)
5759
_ = clusterv1.AddToScheme(FakeScheme)
60+
_ = addonsv1.AddToScheme(FakeScheme)
5861
_ = expv1.AddToScheme(FakeScheme)
5962
_ = apiextensionsv1.AddToScheme(FakeScheme)
6063
_ = controlplanev1.AddToScheme(FakeScheme)

0 commit comments

Comments
 (0)