@@ -91,16 +91,6 @@ var _ = Describe("MachineEphemeralVolumeController", func() {
9191 })
9292
9393 It ("should not delete externally managed volumes for a machine" , func (ctx SpecContext ) {
94- By ("creating an undesired controlled volume" )
95- externalVolume := & storagev1alpha1.Volume {
96- ObjectMeta : metav1.ObjectMeta {
97- Namespace : ns .Name ,
98- GenerateName : "external-volume-" ,
99- },
100- Spec : storagev1alpha1.VolumeSpec {},
101- }
102- Expect (k8sClient .Create (ctx , externalVolume )).To (Succeed ())
103-
10494 By ("creating a machine" )
10595 machine := & computev1alpha1.Machine {
10696 ObjectMeta : metav1.ObjectMeta {
@@ -109,18 +99,21 @@ var _ = Describe("MachineEphemeralVolumeController", func() {
10999 },
110100 Spec : computev1alpha1.MachineSpec {
111101 MachineClassRef : corev1.LocalObjectReference {Name : machineClass .Name },
112- Volumes : []computev1alpha1.Volume {
113- {
114- Name : "primary" ,
115- VolumeSource : computev1alpha1.VolumeSource {
116- VolumeRef : & corev1.LocalObjectReference {Name : externalVolume .Name },
117- },
118- },
119- },
120102 },
121103 }
122104 Expect (k8sClient .Create (ctx , machine )).To (Succeed ())
123105
106+ By ("creating an undesired controlled volume" )
107+ externalVolume := & storagev1alpha1.Volume {
108+ ObjectMeta : metav1.ObjectMeta {
109+ Namespace : ns .Name ,
110+ GenerateName : "external-volume-" ,
111+ },
112+ Spec : storagev1alpha1.VolumeSpec {},
113+ }
114+ _ = ctrl .SetControllerReference (machine , externalVolume , k8sClient .Scheme ())
115+ Expect (k8sClient .Create (ctx , externalVolume )).To (Succeed ())
116+
124117 By ("asserting that the external volume is not being deleted" )
125118 Consistently (Object (externalVolume )).Should (HaveField ("DeletionTimestamp" , BeNil ()))
126119 })
0 commit comments