@@ -223,7 +223,7 @@ var _ = Describe("Dependant garbage collection", func() {
223
223
_ , err = kubeClient .KubernetesInterface ().CoreV1 ().ConfigMaps (testNamespace ).Create (context .TODO (), dependent , metav1.CreateOptions {})
224
224
Expect (err ).NotTo (HaveOccurred (), "dependent could not be created" )
225
225
226
- propagation = "Foreground"
226
+ propagation = metav1 . DeletePropagationForeground
227
227
options = metav1.DeleteOptions {PropagationPolicy : & propagation }
228
228
})
229
229
@@ -238,7 +238,7 @@ var _ = Describe("Dependant garbage collection", func() {
238
238
Eventually (func () error {
239
239
_ , err := operatorClient .OperatorsV1alpha1 ().ClusterServiceVersions (testNamespace ).Get (context .TODO (), ownerA .GetName (), metav1.GetOptions {})
240
240
return err
241
- }).ShouldNot (HaveOccurred ())
241
+ }).Should (HaveOccurred ())
242
242
243
243
})
244
244
@@ -262,7 +262,7 @@ var _ = Describe("Dependant garbage collection", func() {
262
262
Eventually (func () error {
263
263
_ , err := operatorClient .OperatorsV1alpha1 ().ClusterServiceVersions (testNamespace ).Get (context .TODO (), ownerA .GetName (), metav1.GetOptions {})
264
264
return err
265
- }).ShouldNot ( HaveOccurred ( ))
265
+ }).Should ( Equal ( k8serrors . IsNotFound ( err ) ))
266
266
267
267
// delete ownerB in the foreground (to ensure any "blocking" dependents are deleted before ownerB)
268
268
err = operatorClient .OperatorsV1alpha1 ().ClusterServiceVersions (testNamespace ).Delete (context .TODO (), fetchedB .GetName (), options )
@@ -272,11 +272,11 @@ var _ = Describe("Dependant garbage collection", func() {
272
272
Eventually (func () error {
273
273
_ , err := operatorClient .OperatorsV1alpha1 ().ClusterServiceVersions (testNamespace ).Get (context .TODO (), ownerB .GetName (), metav1.GetOptions {})
274
274
return err
275
- }).ShouldNot ( HaveOccurred ( ))
275
+ }).Should ( Equal ( k8serrors . IsNotFound ( err ) ))
276
276
})
277
277
278
278
It ("should have deleted the dependent since both the owners were deleted" , func () {
279
- _ , err := kubeClient .KubernetesInterface ().CoreV1 ().ConfigMaps (testNamespace ).Get (context .TODO (), dependent .GetName (), metav1.GetOptions {})
279
+ cm , err := kubeClient .KubernetesInterface ().CoreV1 ().ConfigMaps (testNamespace ).Get (context .TODO (), dependent .GetName (), metav1.GetOptions {})
280
280
Expect (err ).To (HaveOccurred ())
281
281
Expect (k8serrors .IsNotFound (err )).To (BeTrue ())
282
282
ctx .Ctx ().Logf ("dependent successfully garbage collected after both owners were deleted" )
0 commit comments