@@ -2792,10 +2792,12 @@ var _ = Describe("Install Plan", func() {
2792
2792
_ , err := fetchCatalogSourceOnStatus (crc , mainCatalogSourceName , generatedNamespace .GetName (), catalogSourceRegistryPodSynced ())
2793
2793
require .NoError (GinkgoT (), err )
2794
2794
2795
+ By ("Creating a Subscription" )
2795
2796
subscriptionName := genName ("sub-nginx-" )
2796
2797
subscriptionCleanup := createSubscriptionForCatalog (crc , generatedNamespace .GetName (), subscriptionName , mainCatalogSourceName , packageName , stableChannel , "" , operatorsv1alpha1 .ApprovalAutomatic )
2797
2798
defer subscriptionCleanup ()
2798
2799
2800
+ By ("Attempt to get Subscription" )
2799
2801
subscription , err := fetchSubscription (crc , generatedNamespace .GetName (), subscriptionName , subscriptionHasInstallPlanChecker ())
2800
2802
require .NoError (GinkgoT (), err )
2801
2803
require .NotNil (GinkgoT (), subscription )
@@ -2867,6 +2869,10 @@ var _ = Describe("Install Plan", func() {
2867
2869
By ("Should have removed every matching step" )
2868
2870
require .Equal (GinkgoT (), 0 , len (expectedSteps ), "Actual resource steps do not match expected: %#v" , expectedSteps )
2869
2871
2872
+ By ("Waiting on CSV to succeed before deleting" )
2873
+ _ , err = fetchCSV (crc , generatedNamespace .GetName (), stableCSVName , csvSucceededChecker )
2874
+ require .NoError (GinkgoT (), err )
2875
+
2870
2876
GinkgoT ().Logf ("deleting csv %s/%s" , generatedNamespace .GetName (), stableCSVName )
2871
2877
By ("Explicitly delete the CSV" )
2872
2878
err = crc .OperatorsV1alpha1 ().ClusterServiceVersions (generatedNamespace .GetName ()).Delete (context .Background (), stableCSVName , metav1.DeleteOptions {})
@@ -2875,14 +2881,24 @@ var _ = Describe("Install Plan", func() {
2875
2881
err = nil
2876
2882
}
2877
2883
require .NoError (GinkgoT (), err )
2884
+ By ("Waiting for the CSV to delete" )
2885
+ err = waitForCsvToDelete (generatedNamespace .GetName (), stableCSVName , crc )
2886
+ require .NoError (GinkgoT (), err )
2878
2887
2888
+ nCrs := 0
2889
+ nCrbs := 0
2890
+ By ("Waiting for CRBs and CRs and SAs to delete" )
2879
2891
Eventually (func () bool {
2880
2892
crbs , err := c .KubernetesInterface ().RbacV1 ().ClusterRoleBindings ().List (context .Background (), metav1.ListOptions {LabelSelector : fmt .Sprintf ("%v=%v" , ownerutil .OwnerKey , stableCSVName )})
2881
2893
if err != nil {
2882
2894
GinkgoT ().Logf ("error getting crbs: %v" , err )
2883
2895
return false
2884
2896
}
2885
- if len (crbs .Items ) != 0 {
2897
+ if n := len (crbs .Items ); n != 0 {
2898
+ if n != nCrbs {
2899
+ GinkgoT ().Logf ("crbs remaining: %v" , n )
2900
+ nCrbs = n
2901
+ }
2886
2902
return false
2887
2903
}
2888
2904
@@ -2891,7 +2907,11 @@ var _ = Describe("Install Plan", func() {
2891
2907
GinkgoT ().Logf ("error getting crs: %v" , err )
2892
2908
return false
2893
2909
}
2894
- if len (crs .Items ) != 0 {
2910
+ if n := len (crs .Items ); n != 0 {
2911
+ if n != nCrs {
2912
+ GinkgoT ().Logf ("crs remaining: %v" , n )
2913
+ nCrs = n
2914
+ }
2895
2915
return false
2896
2916
}
2897
2917
0 commit comments