@@ -80,9 +80,12 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator`,
8080 })).NotTo (o .HaveOccurred (), "no conditional updates found in status" )
8181
8282 g .By ("Checking that no conditional updates are recommended" )
83+ conditionalUpdatesLength := len (cv .Status .ConditionalUpdates )
8384 var acceptRisks []configv1.AcceptRisk
85+ var releases []configv1.Release
8486 names := sets .New [string ]()
8587 for _ , cu := range cv .Status .ConditionalUpdates {
88+ releases = append (releases , cu .Release )
8689 o .Expect (cu .RiskNames ).NotTo (o .BeEmpty ())
8790 for _ , name := range cu .RiskNames {
8891 if names .Has (name ) {
@@ -112,12 +115,15 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator`,
112115 o .Expect (err ).NotTo (o .HaveOccurred ())
113116
114117 g .By ("Checking that all conditional updates are recommended" )
115- // waiting for the conditional updates to show up
118+ var releasesNow []configv1.Release
119+ // waiting for the conditional updates to be refreshed
116120 o .Expect (wait .PollUntilContextTimeout (ctx , 30 * time .Second , 5 * time .Minute , true , func (ctx context.Context ) (done bool , err error ) {
117121 cv , err = configClient .ClusterVersions ().Get (ctx , external .DefaultClusterVersionName , metav1.GetOptions {})
118122 o .Expect (err ).NotTo (o .HaveOccurred ())
119123 o .Expect (cv .Status .ConditionalUpdates ).NotTo (o .BeEmpty ())
124+ releasesNow = nil
120125 for _ , cu := range cv .Status .ConditionalUpdates {
126+ releasesNow = append (releasesNow , cu .Release )
121127 recommendedCondition := meta .FindStatusCondition (cu .Conditions , external .ConditionalUpdateConditionTypeRecommended )
122128 o .Expect (recommendedCondition ).NotTo (o .BeNil ())
123129 if recommendedCondition .Status != metav1 .ConditionTrue {
@@ -126,5 +132,9 @@ var _ = g.Describe(`[Jira:"Cluster Version Operator"] cluster-version-operator`,
126132 }
127133 return true , nil
128134 })).NotTo (o .HaveOccurred (), "no conditional updates are recommended in status after accepting risks" )
135+
136+ o .Expect (cv .Spec .DesiredUpdate .AcceptRisks ).To (o .Equal (acceptRisks ))
137+ o .Expect (cv .Status .ConditionalUpdates ).To (o .HaveLen (conditionalUpdatesLength ))
138+ o .Expect (releasesNow ).To (o .Equal (releases ))
129139 })
130140})
0 commit comments