@@ -335,8 +335,8 @@ spec:
335
335
g .Expect (clPrimary .List (ctx , samplePods , client .InNamespace ("sample" ))).To (Succeed ())
336
336
for _ , pod := range samplePods .Items {
337
337
g .Expect (pod .DeletionTimestamp ).To (BeNil ())
338
- g .Expect (pod ).Should (HaveCondition (corev1 .PodReady , metav1 .ConditionTrue ), "Pod is not Ready in sample namespace; unexpected Condition" )
339
- g .Expect (pod .Annotations ["istio.io/rev" ]).Should (Equal (istio .Status .ActiveRevisionName ))
338
+ g .Expect (pod ).To (HaveCondition (corev1 .PodReady , metav1 .ConditionTrue ), "Pod is not Ready in sample namespace; unexpected Condition" )
339
+ g .Expect (pod .Annotations ["istio.io/rev" ]).To (Equal (istio .Status .ActiveRevisionName ))
340
340
}
341
341
}).Should (Succeed ())
342
342
@@ -346,14 +346,15 @@ spec:
346
346
istio .Status .ActiveRevisionName ,
347
347
)
348
348
Log ("Patch" , patch )
349
- Expect (k1 .WithNamespace (controlPlaneNamespace ).Patch ("deployments" , "istio-eastwestgateway" , "merge" , patch )).To (Succeed (), "Error patching istio-eastwestgateway deployment" )
349
+ Expect (k1 .WithNamespace (controlPlaneNamespace ).Patch ("deployments" , "istio-eastwestgateway" , "merge" , patch )).
350
+ To (Succeed (), "Error patching istio-eastwestgateway deployment" )
350
351
Eventually (func (g Gomega ) {
351
352
gatewayPods := & corev1.PodList {}
352
353
g .Expect (clPrimary .List (ctx , gatewayPods , client .InNamespace (controlPlaneNamespace ), client.MatchingLabels {"istio" : "eastwestgateway" })).To (Succeed ())
353
354
for _ , pod := range gatewayPods .Items {
354
355
g .Expect (pod .DeletionTimestamp ).To (BeNil ())
355
- g .Expect (pod ).Should (HaveCondition (corev1 .PodReady , metav1 .ConditionTrue ), "Pod is not Ready in sample namespace; unexpected Condition" )
356
- g .Expect (pod .Annotations ["istio.io/rev" ]).Should (Equal (istio .Status .ActiveRevisionName ))
356
+ g .Expect (pod ).To (HaveCondition (corev1 .PodReady , metav1 .ConditionTrue ), "Pod is not Ready in sample namespace; unexpected Condition" )
357
+ g .Expect (pod .Annotations ["istio.io/rev" ]).To (Equal (istio .Status .ActiveRevisionName ))
357
358
}
358
359
}).Should (Succeed ())
359
360
})
0 commit comments