Skip to content

Commit 226429e

Browse files
committed
pinnedimages: Do not fail prematurely in waitForStatusX
1 parent 9ff893a commit 226429e

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

test/extended/machine_config/pinnedimages.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -411,17 +411,20 @@ func waitForPISStatusX(ctx context.Context, oc *exutil.CLI, kubeClient *kubernet
411411
// Wait for PIS object to get created
412412
appliedPIS, err := clientSet.MachineconfigurationV1().PinnedImageSets().Get(context.TODO(), pisName, metav1.GetOptions{})
413413
if err != nil {
414-
return false, fmt.Errorf("PIS Object not created yet: %w", err)
414+
framework.Logf("Retrying PIS Status with non-fatal error: PIS Object not created yet: %s", err)
415+
return false, nil
415416
}
416417

417418
pool, err := clientSet.MachineconfigurationV1().MachineConfigPools().Get(ctx, appliedPIS.Labels["machineconfiguration.openshift.io/role"], metav1.GetOptions{})
418419
if err != nil {
419-
return false, fmt.Errorf("failed to get MCP mentioned in PIS: %w", err)
420+
framework.Logf("Retrying PIS Status with non-fatal error: failed to get MCP mentioned in PIS: %s", err)
421+
return false, nil
420422
}
421423

422424
nodes, err := getNodesForPool(ctx, oc, kubeClient, pool)
423425
if err != nil {
424-
return false, fmt.Errorf("failed to get Nodes from MCP %q mentioned in PIS: %w", pool.Name, err)
426+
framework.Logf("Retrying PIS Status with non-fatal error: failed to get Nodes from MCP %q mentioned in PIS: %s", pool.Name, err)
427+
return false, nil
425428
}
426429

427430
doneNodes := 0

0 commit comments

Comments
 (0)