Skip to content

test/extended/util/openshift/clusterversionoperator/adminack: Accept MultipleReasons #27110

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
May 6, 2022
Merged

test/extended/util/openshift/clusterversionoperator/adminack: Accept MultipleReasons #27110

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions test/extended/util/openshift/clusterversionoperator/adminack.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ func (t *AdminAckTest) test(ctx context.Context, exercisedGates map[string]struc
"false with reason AdminAckRequired and message %q.", k, v)
}
framework.Logf("Gate %s has been ack'ed. Upgradeable is "+
"false but not due to this gate which would set reason AdminAckRequired with message %s. %s", k, v, getUpgradeable(ctx, t.Config))
"false but not due to this gate which would set reason AdminAckRequired or MultipleReasons with message %s. %s", k, v, getUpgradeable(ctx, t.Config))
}
// Clear admin ack configmap gate ack
if err := setAdminGate(ctx, k, "", t.Oc); err != nil {
Expand Down Expand Up @@ -202,12 +202,12 @@ func getAdminAcksConfigMap(ctx context.Context, oc *exutil.CLI) (*corev1.ConfigM
return cm, nil
}

// adminAckRequiredWithMessage returns true if Upgradeable condition reason contains AdminAckRequired
// and message contains given message.
// adminAckRequiredWithMessage returns true if Upgradeable condition reason is AdminAckRequired
// or MultipleReasons and message contains given message.
func adminAckRequiredWithMessage(ctx context.Context, config *restclient.Config, message string) bool {
clusterVersion := getClusterVersion(ctx, config)
cond := getUpgradeableStatusCondition(clusterVersion.Status.Conditions)
if cond != nil && strings.Contains(cond.Reason, "AdminAckRequired") && strings.Contains(cond.Message, message) {
if cond != nil && (cond.Reason == "AdminAckRequired" || cond.Reason == "MultipleReasons") && strings.Contains(cond.Message, message) {
return true
}
return false
Expand Down Expand Up @@ -247,20 +247,20 @@ func waitForAdminAckRequired(ctx context.Context, config *restclient.Config, mes
}
return false, nil
}); err != nil {
return fmt.Errorf("Error while waiting for Upgradeable to go AdminAckRequired with message %q: %w\n%s", message, err, getUpgradeable(ctx, config))
return fmt.Errorf("Error while waiting for Upgradeable to complain about AdminAckRequired with message %q: %w\n%s", message, err, getUpgradeable(ctx, config))
}
return nil
}

func waitForAdminAckNotRequired(ctx context.Context, config *restclient.Config, message string) error {
framework.Logf("Waiting for Upgradeable to not be AdminAckRequired for %q ...", message)
framework.Logf("Waiting for Upgradeable to not complain about AdminAckRequired for %q ...", message)
if err := wait.PollImmediate(10*time.Second, 3*time.Minute, func() (bool, error) {
if !adminAckRequiredWithMessage(ctx, config, message) {
return true, nil
}
return false, nil
}); err != nil {
return fmt.Errorf("Error while waiting for Upgradeable to not be AdminAckRequired with message %q: %w\n%s", message, err, getUpgradeable(ctx, config))
return fmt.Errorf("Error while waiting for Upgradeable to not complain about AdminAckRequired with message %q: %w\n%s", message, err, getUpgradeable(ctx, config))
}
return nil
}
Expand Down