|
9 | 9 | . "github.com/onsi/gomega" |
10 | 10 | corev1 "k8s.io/api/core/v1" |
11 | 11 | metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" |
| 12 | + "k8s.io/utils/ptr" |
12 | 13 | "sigs.k8s.io/controller-runtime/pkg/client" |
13 | 14 |
|
14 | 15 | "github.com/cobaltcore-dev/cloud-profile-sync/api/v1alpha1" |
@@ -44,11 +45,22 @@ var _ = Describe("The ManagedCloudProfile reconciler", func() { |
44 | 45 | { |
45 | 46 | Name: "bar", |
46 | 47 | 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 | + }, |
48 | 53 | }, |
| 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), |
49 | 62 | }, |
50 | 63 | }, |
51 | | - MachineTypes: []gardenerv1beta1.MachineType{{Name: "baz"}}, |
52 | 64 | } |
53 | 65 | Expect(k8sClient.Create(ctx, &mcp)).To(Succeed()) |
54 | 66 |
|
@@ -96,8 +108,14 @@ var _ = Describe("The ManagedCloudProfile reconciler", func() { |
96 | 108 | var mcp v1alpha1.ManagedCloudProfile |
97 | 109 | mcp.Name = "test-oci" |
98 | 110 | 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 | + }, |
101 | 119 | } |
102 | 120 | mcp.Spec.MachineImageUpdates = []v1alpha1.MachineImageUpdate{ |
103 | 121 | { |
@@ -133,8 +151,8 @@ var _ = Describe("The ManagedCloudProfile reconciler", func() { |
133 | 151 | Expect(mi).To(HaveLen(1)) |
134 | 152 | Expect(mi[0].Name).To(Equal("the-image")) |
135 | 153 | 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"}}})) |
138 | 156 |
|
139 | 157 | Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(&mcp), &mcp)).To(Succeed()) |
140 | 158 | Expect(mcp.Status.Status).To(Equal(v1alpha1.SucceededReconcileStatus)) |
|
0 commit comments