Skip to content

Commit 186bf43

Browse files
committed
Fix tests
1 parent b347be6 commit 186bf43

1 file changed

Lines changed: 24 additions & 6 deletions

File tree

controllers/managedcloudprofile_controller_test.go

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
. "github.com/onsi/gomega"
1010
corev1 "k8s.io/api/core/v1"
1111
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
12+
"k8s.io/utils/ptr"
1213
"sigs.k8s.io/controller-runtime/pkg/client"
1314

1415
"github.com/cobaltcore-dev/cloud-profile-sync/api/v1alpha1"
@@ -44,11 +45,22 @@ var _ = Describe("The ManagedCloudProfile reconciler", func() {
4445
{
4546
Name: "bar",
4647
Versions: []gardenerv1beta1.MachineImageVersion{
47-
{ExpirableVersion: gardenerv1beta1.ExpirableVersion{Version: "0.3.0"}},
48+
{
49+
ExpirableVersion: gardenerv1beta1.ExpirableVersion{Version: "0.3.0"},
50+
CRI: []gardenerv1beta1.CRI{{Name: "containerd"}},
51+
Architectures: []string{"amd64"},
52+
},
4853
},
54+
UpdateStrategy: ptr.To(gardenerv1beta1.UpdateStrategyMajor),
55+
},
56+
},
57+
MachineTypes: []gardenerv1beta1.MachineType{
58+
{
59+
Name: "baz",
60+
Architecture: ptr.To("amd64"),
61+
Usable: ptr.To(true),
4962
},
5063
},
51-
MachineTypes: []gardenerv1beta1.MachineType{{Name: "baz"}},
5264
}
5365
Expect(k8sClient.Create(ctx, &mcp)).To(Succeed())
5466

@@ -96,8 +108,14 @@ var _ = Describe("The ManagedCloudProfile reconciler", func() {
96108
var mcp v1alpha1.ManagedCloudProfile
97109
mcp.Name = "test-oci"
98110
mcp.Spec.CloudProfile = v1alpha1.CloudProfileSpec{
99-
Regions: []gardenerv1beta1.Region{{Name: "foo"}},
100-
MachineTypes: []gardenerv1beta1.MachineType{{Name: "baz"}},
111+
Regions: []gardenerv1beta1.Region{{Name: "foo"}},
112+
MachineTypes: []gardenerv1beta1.MachineType{
113+
{
114+
Name: "baz",
115+
Architecture: ptr.To("amd64"),
116+
Usable: ptr.To(true),
117+
},
118+
},
101119
}
102120
mcp.Spec.MachineImageUpdates = []v1alpha1.MachineImageUpdate{
103121
{
@@ -133,8 +151,8 @@ var _ = Describe("The ManagedCloudProfile reconciler", func() {
133151
Expect(mi).To(HaveLen(1))
134152
Expect(mi[0].Name).To(Equal("the-image"))
135153
vers := mi[0].Versions
136-
Expect(vers).To(ContainElement(gardenerv1beta1.MachineImageVersion{ExpirableVersion: gardenerv1beta1.ExpirableVersion{Version: "1.0.0"}, Architectures: []string{"amd64"}}))
137-
Expect(vers).To(ContainElement(gardenerv1beta1.MachineImageVersion{ExpirableVersion: gardenerv1beta1.ExpirableVersion{Version: "1.0.1+abc"}, Architectures: []string{"amd64"}}))
154+
Expect(vers).To(ContainElement(gardenerv1beta1.MachineImageVersion{ExpirableVersion: gardenerv1beta1.ExpirableVersion{Version: "1.0.0"}, Architectures: []string{"amd64"}, CRI: []gardenerv1beta1.CRI{{Name: "containerd"}}}))
155+
Expect(vers).To(ContainElement(gardenerv1beta1.MachineImageVersion{ExpirableVersion: gardenerv1beta1.ExpirableVersion{Version: "1.0.1+abc"}, Architectures: []string{"amd64"}, CRI: []gardenerv1beta1.CRI{{Name: "containerd"}}}))
138156

139157
Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(&mcp), &mcp)).To(Succeed())
140158
Expect(mcp.Status.Status).To(Equal(v1alpha1.SucceededReconcileStatus))

0 commit comments

Comments
 (0)